Fixed stuck at loading screen issue

Author: arkangel-dev

SyncPlayWPF/.vs/SyncPlayWPF/v16/.suo

@@ -48,16 +48,18 @@ private void JoinRoom_Clicked(object sender, RoutedEventArgs e) {
             Common.Shared.Wrapper.SyncPlayClient.OnDisconnect += SyncPlayClient_OnDisconnect;
 
             Common.Shared.Wrapper.SyncPlayClient.ConnectAsync();
-            Common.Shared.MasterOverrideTransition.ShowPage(new Pages.ApplicationPages.LoadingScreen());          
+            Common.Shared.MasterOverrideTransition.ShowPage(new Pages.ApplicationPages.LoadingScreen());
+            
         }
 
         private void SyncPlayClient_OnDisconnect(SyncPlay.SyncPlayClient sender, SyncPlay.EventArgs.ServerDisconnectedEventArgs e) {
             Console.WriteLine($"Failed to connect. Reasons : {e.ReasonForKick}");
             Dispatcher.Invoke(() => {
                 Common.Shared.MasterOverrideTransition.UnloadCurrentPage();
+                Common.Shared.Wrapper.SyncPlayClient.OnConnect -= SyncPlayClient_OnConnect;
+                Common.Shared.Wrapper.SyncPlayClient.OnDisconnect -= SyncPlayClient_OnDisconnect;
             });
-            Common.Shared.Wrapper.Player = null;
-            Common.Shared.Wrapper = null;
+            Common.Shared.Wrapper.Dispose();
         }
 
         private void SyncPlayClient_OnConnect(SyncPlay.SyncPlayClient sender, SyncPlay.EventArgs.ServerConnectedEventArgs e) {

SyncPlayWPF/SyncPlayWPF/Pages/NewSessionPage.xaml.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2021.205.23.0")]
-[assembly: AssemblyFileVersion("2021.205.23.0")]
+[assembly: AssemblyVersion("2021.205.36.0")]
+[assembly: AssemblyFileVersion("2021.205.36.0")]

SyncPlayWPF/SyncPlayWPF/Properties/AssemblyInfo.cs

@@ -149,7 +149,8 @@ public void SetPauseState(bool p) {
         }
 
         public void ClosePlayer() {
-            this.PlayerProcess.Kill();
+            if (this.PlayerProcess != null)
+                this.PlayerProcess.Kill();
         }
 
         public event MediaPlayerInterface.HandleDebugMessages OnDebugMessage;

SyncPlayWPF/SyncPlayWPF/SyncPlay/MediaPlayers/VLCMediaPlayer/Connector.cs

@@ -44,6 +44,12 @@ public bool Connect() {
             return true;
         }
 
+
+        public void Disconnect() {
+            this.client.GetStream().Close();
+            this.client.Close();
+        }
+
         public void ActivateTLS() {
             this.SSL = new SslStream(stream);
             this.SSL.AuthenticateAsClient(this.Host);
@@ -81,7 +87,7 @@ private void ProcessIncoming() {
                         NotifySubscribersOnNewMessage(parts[i].Trim(' '));
                     }
 
-                } catch (IOException e) {
+                } catch (Exception e) {
                     Misc.Common.PrintInColor("Stream broken!", ConsoleColor.Red);
                     Misc.Common.PrintInColor(e.Message, ConsoleColor.Red);
                     Misc.Common.PrintInColor(e.StackTrace, ConsoleColor.Red);

SyncPlayWPF/SyncPlayWPF/SyncPlay/NetworkClient.cs

@@ -142,6 +142,10 @@ public void ConnectAsync() {
             connectAsyncThread.Start();
         }
 
+        public void Dispose() {
+            this.nclient.Disconnect();
+        }
+
         public bool Connect() {
             try {
                 nclient = new NetworkClient(ServerIP, Port);
@@ -316,6 +320,7 @@ private void NewIncomingMessage(NetworkClient sender, string message) {
             if (jobj.ContainsKey("Error")) {
                 var ErrorMessage = jobj.Value<JObject>("Error")
                     .Value<String>("message");
+                Thread.Sleep(3000);
                 OnDisconnect?.Invoke(this, new EventArgs.ServerDisconnectedEventArgs(true, ErrorMessage));
                 return;
             }

SyncPlayWPF/SyncPlayWPF/SyncPlay/SyncPlayClient.cs

@@ -28,6 +28,8 @@ private void SyncPlayClient_OnConnect(SyncPlayClient sender, EventArgs.ServerCon
             this.Player.StartPlayerInstance();
         }
 
+
+
         private void NewFileLoad(EventArgs.NewFileLoadEventArgs e) {
             SyncPlayClient.AddFileToPlayList(e.AbsoluteFilePath);
         }
@@ -36,5 +38,17 @@ private void PlayerStateChanged(SyncPlayClient sender, EventArgs.RemoteStateChan
             Player.SetPauseState(e.Paused);
             Player.SetPosition(e.Position + RemoteSeekOffset);
         }
+
+        public void Dispose() {
+            if (Player != null) {
+                Player.ClosePlayer();
+                Player = null;
+            }
+
+            if (SyncPlayClient != null) {
+                SyncPlayClient.Dispose();
+                SyncPlayClient = null;
+            }
+        }
     }
 }