Merge pull request #4220 from fufesou/fix/win_headless

fix plugout virtual monitor

src/server/video_service.rs

@@ -274,7 +274,7 @@ fn create_capturer(
 fn ensure_close_virtual_device() -> ResultType<()> {
     let num_displays = Display::all()?.len();
     if num_displays > 1 {
-        virtual_display_manager::plug_out_headless();
+        let _res = virtual_display_manager::plug_out_headless();
     }
     Ok(())
 }
@@ -927,7 +927,9 @@ fn try_get_displays() -> ResultType<Vec<Display>> {
         }
     } else if displays.len() > 1 {
         // If more than one displays exists, close RustDeskVirtualDisplay
-        let _res = virtual_display_manager::plug_in_headless();
+        if virtual_display_manager::plug_out_headless() {
+            displays = Display::all()?;
+        }
     }
     Ok(displays)
 }

src/virtual_display_manager.rs

@@ -59,12 +59,15 @@ pub fn plug_in_headless() -> ResultType<()> {
     Ok(())
 }
 
-pub fn plug_out_headless() {
+pub fn plug_out_headless() -> bool {
     let mut manager = VIRTUAL_DISPLAY_MANAGER.lock().unwrap();
     if let Some(index) = manager.headless_index.take() {
         if let Err(e) = virtual_display::plug_out_monitor(index) {
             log::error!("Plug out monitor failed {}", e);
         }
+        true
+    } else {
+        false
     }
 }