Skip to content

Commit 4b9d30d

Browse files
committed
Quality Fixes + Bug Fixes Batch B
1 parent 267ec6e commit 4b9d30d

File tree

21 files changed

+52
-34
lines changed

21 files changed

+52
-34
lines changed
22.5 KB
Binary file not shown.

SyncPlayWPF/SyncPlayWPF/MainWindow.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
Title="SyncPlay.NET" Height="600" Width="800"
1111
WindowStartupLocation="CenterScreen"
1212
SnapsToDevicePixels="True"
13-
ResizeMode="CanResize">
13+
ResizeMode="CanResize"
14+
Closing="Window_Closing">
1415
<Window.Resources>
1516
<ResourceDictionary Source="Themes/Generic.xaml"/>
1617
</Window.Resources>

SyncPlayWPF/SyncPlayWPF/MainWindow.xaml.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,10 @@ private void SwitchState() {
128128
}
129129
}
130130
}
131+
132+
private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e) {
133+
if (Common.Shared.Wrapper != null)
134+
Common.Shared.Wrapper.Player.ClosePlayer();
135+
}
131136
}
132137
}

SyncPlayWPF/SyncPlayWPF/Pages/SessionLandingPage.xaml.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ public SessionLandingPage() {
2727
this.Loaded += PageLoaded;
2828
}
2929

30-
private void PageLoaded(object sender, RoutedEventArgs e) {
31-
30+
private void PageLoaded(object sender, RoutedEventArgs e) {
3231
Common.Shared.Wrapper.Player.OnPlayerClosed += delegate {
3332
ThreadStart ts = delegate () {
3433
Dispatcher.BeginInvoke((Action)delegate () {
@@ -38,8 +37,6 @@ private void PageLoaded(object sender, RoutedEventArgs e) {
3837
Thread t = new Thread(ts);
3938
t.Start();
4039
};
41-
42-
4340
}
4441

4542
private void ShowChatWindow() {

SyncPlayWPF/SyncPlayWPF/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("2021.203.9.0")]
55-
[assembly: AssemblyFileVersion("2021.203.9.0")]
54+
[assembly: AssemblyVersion("2021.204.5.0")]
55+
[assembly: AssemblyFileVersion("2021.204.5.0")]

SyncPlayWPF/SyncPlayWPF/SyncPlay/SyncPlayWrapper.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public SyncPlayWrapper(string serverip, int port, string username, string passwo
2020

2121
SyncPlayClient.OnPlayerStateChange += PlayerStateChanged;
2222

23-
2423
mp.StartPlayerInstance();
2524
}
2625

0 Bytes
Binary file not shown.
2 KB
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)