Handle errors in CreateFromArgb32Callback.

immense · Aug 7, 2020 · 0027d9e · 0027d9e
1 parent 23ada6e
commit 0027d9e
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 20 deletions.
diff --git a/Desktop.Core/Services/WebRtcSession.cs b/Desktop.Core/Services/WebRtcSession.cs
@@ -207,29 +207,41 @@ private void DataChannel_BufferingChanged(ulong previous, ulong current, ulong l
 
         private void GetCaptureFrame(in FrameRequest request)
         {
-            using (var currentFrame = Viewer.Capturer.GetNextFrame())
+            try
             {
-                var bitmapData = currentFrame.LockBits(
-                       Viewer.Capturer.CurrentScreenBounds,
-                       System.Drawing.Imaging.ImageLockMode.ReadOnly,
-                       System.Drawing.Imaging.PixelFormat.Format32bppArgb);
-
-                try
+                using (var currentFrame = Viewer.Capturer.GetNextFrame())
                 {
-                    var frame = new Argb32VideoFrame()
+                    if (currentFrame == null)
                     {
-                        data = bitmapData.Scan0,
-                        height = (uint)currentFrame.Height,
-                        width = (uint)currentFrame.Width,
-                        stride = bitmapData.Stride
-                    };
-                    request.CompleteRequest(in frame);
-                }
-                finally
-                {
-                    currentFrame.UnlockBits(bitmapData);
-                }
+                        return;
+                    }
+
+                    var bitmapData = currentFrame.LockBits(
+                           Viewer.Capturer.CurrentScreenBounds,
+                           System.Drawing.Imaging.ImageLockMode.ReadOnly,
+                           System.Drawing.Imaging.PixelFormat.Format32bppArgb);
 
+                    try
+                    {
+                        var frame = new Argb32VideoFrame()
+                        {
+                            data = bitmapData.Scan0,
+                            height = (uint)currentFrame.Height,
+                            width = (uint)currentFrame.Width,
+                            stride = bitmapData.Stride
+                        };
+                        request.CompleteRequest(in frame);
+                    }
+                    finally
+                    {
+                        currentFrame.UnlockBits(bitmapData);
+                    }
+
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.Write(ex);
             }
 
         }

diff --git a/Server/wwwroot/scripts/DataGrid.js b/Server/wwwroot/scripts/DataGrid.js
diff --git a/Server/wwwroot/scripts/DataGrid.js.map b/Server/wwwroot/scripts/DataGrid.js.map
diff --git a/Server/wwwroot/scripts/DataGrid.ts b/Server/wwwroot/scripts/DataGrid.ts
@@ -30,6 +30,7 @@ export function AddOrUpdateDevices(devices: Array<Device>) {
         AddOrUpdateDevice(x, false);
     });
     ApplyFilter();
+    UpdateDeviceCounts();
 }
 
 export function AddOrUpdateDevice(device: Device, sortDevices: boolean) {
@@ -42,10 +43,17 @@ export function AddOrUpdateDevice(device: Device, sortDevices: boolean) {
     }
 
     if (sortDevices) {
+        var selectedDevices = GetSelectedDevices();
+
         UI.DeviceGrid.querySelectorAll(".record-row").forEach(row => {
             row.remove();
         });
         AddOrUpdateDevices(DataSource);
+
+        selectedDevices.forEach(x => {
+            document.getElementById(x.ID).classList.add("row-selected");
+        });
+
         return;
     }