fix: Fix bug that drives are always be redirected in RDP. fix #394

VShawn · VShawn · commit bc3d7b3ea3a1 · 2023-04-24T13:54:34.000+08:00
diff --git a/Ui/Bootstrapper.cs b/Ui/Bootstrapper.cs
@@ -169,9 +169,19 @@ protected override void OnUnhandledException(DispatcherUnhandledExceptionEventAr
                 lock (this)
                 {
                     SimpleLogHelper.Fatal(e.Exception);
-                    var errorReport = new ErrorReportWindow(e.Exception);
-                    errorReport.ShowDialog();
-                    App.Close(100);
+                    Execute.OnUIThread(() =>
+                    {
+                        if (!App.ExitingFlag)
+                            try
+                            {
+                                var errorReport = new ErrorReportWindow(e.Exception);
+                                errorReport.ShowDialog();
+                            }
+                            finally
+                            {
+                                App.Close(100);
+                            }
+                    });
                 }
             e.Handled = true;
         }
diff --git a/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.cs b/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.cs
@@ -74,7 +74,7 @@ private void ParentWindowSetToWindow()
                 return;
             }
 
-            if (ParentWindow is FullScreenWindowView f && f.IsLoaded == false)
+            if (ParentWindow is FullScreenWindowView { IsLoaded: false })
             {
                 return;
             }
diff --git a/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.xaml.cs b/Ui/View/Host/ProtocolHosts/AxMsRdpClient09Host.xaml.cs
@@ -269,24 +269,30 @@ private void RdpInitRedirect()
 
             // purpose is not clear
             ((IMsRdpClientNonScriptable3)_rdpClient.GetOcx()).RedirectDynamicDrives = true; // Specifies or retrieves whether dynamically attached Plug and Play (PnP) drives that are enumerated while in a session are available for redirection. https://docs.microsoft.com/en-us/windows/win32/termserv/imsrdpclientnonscriptable3-redirectdynamicdrives
-            // enable then usb disk can be redirect
-            ((IMsRdpClientNonScriptable3)_rdpClient.GetOcx()).RedirectDynamicDevices = _rdpSettings.EnableRedirectDrivesPlugIn == true; // Specifies whether dynamically attached PnP devices that are enumerated while in a session are available for redirection. https://docs.microsoft.com/en-us/windows/win32/termserv/imsrdpclientnonscriptable3-redirectdynamicdevices
-            if (_rdpClient.AdvancedSettings9.RedirectDrives || _rdpSettings.EnableRedirectDrivesPlugIn == true)
+
+            if (_rdpSettings.EnableDiskDrives == true 
+                || _rdpSettings.EnableRedirectDrivesPlugIn == true)
             {
                 _rdpClient.AdvancedSettings9.RedirectDrives = true;
-                // disable disk
-                if (_rdpClient.AdvancedSettings9.RedirectDrives == false)
+
+                // enable then usb disk can be redirect
+                if (_rdpSettings.EnableRedirectDrivesPlugIn == true)
                 {
-                    var ocx = (MSTSCLib.IMsRdpClientNonScriptable7)_rdpClient.GetOcx();
-                    ocx.DriveCollection.RescanDrives(false);
-                    for (int i = 0; i < ocx.DriveCollection.DriveCount; i++)
-                    {
-                        ocx.DriveCollection.DriveByIndex[(uint)i].RedirectionState = false;
-                    }
+                    ((IMsRdpClientNonScriptable3)_rdpClient.GetOcx()).RedirectDynamicDevices = true; // Specifies whether dynamically attached PnP devices that are enumerated while in a session are available for redirection. https://docs.microsoft.com/en-us/windows/win32/termserv/imsrdpclientnonscriptable3-redirectdynamicdevices
+                    RedirectDevice();
                 }
             }
 
-            RedirectDevice();
+            // disable local disk
+            if (_rdpSettings.EnableDiskDrives == false)
+            {
+                var ocx = (MSTSCLib.IMsRdpClientNonScriptable7)_rdpClient.GetOcx();
+                ocx.DriveCollection.RescanDrives(false);
+                for (int i = 0; i < ocx.DriveCollection.DriveCount; i++)
+                {
+                    ocx.DriveCollection.DriveByIndex[(uint)i].RedirectionState = false;
+                }
+            }
 
 
             _rdpClient.AdvancedSettings9.RedirectClipboard = _rdpSettings.EnableClipboard == true;
diff --git a/Ui/View/ServerList/ServerListPageView.xaml.cs b/Ui/View/ServerList/ServerListPageView.xaml.cs
@@ -153,7 +153,7 @@ private void UIElement_OnPreviewMouseDown(object sender, MouseButtonEventArgs e)
         }
         void UIElement_PreviewMouseMoveEvent(object sender, MouseEventArgs e)
         {
-            SimpleLogHelper.Warning($"{e.LeftButton} + {sender is Grid}");
+            //SimpleLogHelper.Debug($"{e.LeftButton} + {sender is Grid}");
             if (e.LeftButton == MouseButtonState.Pressed)
             {
                 // drag ListBoxItem

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ private void ParentWindowSetToWindow()`
`74`	`74`	`return;`
`75`	`75`	`}`
`76`	`76`
`77`		`- if (ParentWindow is FullScreenWindowView f && f.IsLoaded == false)`
	`77`	`+ if (ParentWindow is FullScreenWindowView { IsLoaded: false })`
`78`	`78`	`{`
`79`	`79`	`return;`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ private void UIElement_OnPreviewMouseDown(object sender, MouseButtonEventArgs e)`
`153`	`153`	`}`
`154`	`154`	`void UIElement_PreviewMouseMoveEvent(object sender, MouseEventArgs e)`
`155`	`155`	`{`
`156`		`- SimpleLogHelper.Warning($"{e.LeftButton} + {sender is Grid}");`
	`156`	`+ //SimpleLogHelper.Debug($"{e.LeftButton} + {sender is Grid}");`
`157`	`157`	`if (e.LeftButton == MouseButtonState.Pressed)`
`158`	`158`	`{`
`159`	`159`	`// drag ListBoxItem`