Dispose of DataChannel before exiting.

immense · Aug 7, 2020 · 4686fc6 · 4686fc6
1 parent 0027d9e
commit 4686fc6
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 25 deletions.
diff --git a/Desktop.Core/Models/Viewer.cs b/Desktop.Core/Models/Viewer.cs
@@ -107,19 +107,28 @@ public async Task InitializeWebRtc()
             }
         }
 
-        public bool IsUsingWebRtcVideo()
+        public bool IsUsingWebRtcVideo
         {
-            return RtcSession?.IsVideoTrackConnected == true;
+            get
+            {
+                return RtcSession?.IsPeerConnected == true && RtcSession?.IsVideoTrackConnected == true;
+            }
         }
 
-        public bool IsStalled()
+        public bool IsStalled
         {
-            return PendingSentFrames.TryPeek(out var result) && DateTimeOffset.Now - result > TimeSpan.FromSeconds(15);
+            get
+            {
+                return PendingSentFrames.TryPeek(out var result) && DateTimeOffset.Now - result > TimeSpan.FromSeconds(15);
+            }
         }
 
-        public bool IsUsingWebRtc()
+        public bool IsUsingWebRtc
         {
-            return RtcSession?.IsPeerConnected == true && RtcSession?.IsDataChannelOpen == true;
+            get
+            {
+                return RtcSession?.IsPeerConnected == true && RtcSession?.IsDataChannelOpen == true;
+            }
         }
 
         public async Task SendAudioSample(byte[] audioSample)
@@ -212,7 +221,7 @@ private async void ClipboardService_ClipboardTextChanged(object sender, string c
         }
         private Task SendToViewer(Action webRtcSend, Func<Task> websocketSend)
         {
-            if (IsUsingWebRtc())
+            if (IsUsingWebRtc)
             {
                 webRtcSend();
                 return Task.CompletedTask;

diff --git a/Desktop.Core/Services/ScreenCaster.cs b/Desktop.Core/Services/ScreenCaster.cs
@@ -96,12 +96,12 @@ public async Task BeginScreenCasting(ScreenCastRequest screenCastRequest)
                 {
                     try
                     {
-                        if (viewer.IsUsingWebRtcVideo())
+                        if (viewer.IsUsingWebRtcVideo)
                         {
-                            Thread.Sleep(10);
+                            Thread.Sleep(100);
                             continue;
                         }
-                        if (viewer.IsStalled())
+                        if (viewer.IsStalled)
                         {
                             // Viewer isn't responding.  Abort sending.
                             break;

diff --git a/Desktop.Core/Services/WebRtcSession.cs b/Desktop.Core/Services/WebRtcSession.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace Remotely.Desktop.Core.Services
@@ -56,7 +57,13 @@ public void Dispose()
         {
             try
             {
-                PeerSession?.Close();
+                Transceiver?.LocalVideoTrack?.Dispose();
+                VideoSource?.Dispose();
+                try
+                {
+                    PeerSession?.RemoveDataChannel(CaptureChannel);
+                }
+                catch { }
                 PeerSession?.Dispose();
             }
             catch { }

diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs
@@ -64,10 +64,8 @@ public static void Main(string[] args)
                 {
                     StartUiThread(() => new MainWindow());
                 }
-
-                System.Windows.Forms.Application.Run();
 
-                Environment.Exit(0);
+                System.Windows.Forms.Application.Run();
 
             }
             catch (Exception ex)

diff --git a/Desktop.Win/Services/ScreenCapturerWin.cs b/Desktop.Win/Services/ScreenCapturerWin.cs
@@ -164,12 +164,7 @@ private Bitmap GetBitBltFrame()
             catch (Exception ex)
             {
                 Logger.Write(ex);
-                Logger.Write("Capturer error.  Trying to switch desktops in BitBltCapture.");
-                if (Win32Interop.SwitchToInputDesktop())
-                {
-                    Win32Interop.GetCurrentDesktop(out var desktopName);
-                    Logger.Write($"Switch to desktop {desktopName} after capture error in BitBltCapture.");
-                }
+                Logger.Write("Capturer error in BitBltCapture.");
                 NeedsInit = true;
             }
 

diff --git a/Server/wwwroot/scripts/RemoteControl/UI.js b/Server/wwwroot/scripts/RemoteControl/UI.js
diff --git a/Server/wwwroot/scripts/RemoteControl/UI.js.map b/Server/wwwroot/scripts/RemoteControl/UI.js.map
diff --git a/Server/wwwroot/scripts/RemoteControl/UI.ts b/Server/wwwroot/scripts/RemoteControl/UI.ts
@@ -93,8 +93,6 @@ export function Prompt(promptMessage: string): Promise<string> {
 export function SetScreenSize(width: number, height: number) {
     ScreenViewer.width = width;
     ScreenViewer.height = height;
-    //VideoScreenViewer.width = width;
-    //VideoScreenViewer.height = height;
     Screen2DContext.clearRect(0, 0, width, height);
 }