diff --git a/src/platform/macos.mm b/src/platform/macos.mm
index 443351469..8be0c6db5 100644
--- a/src/platform/macos.mm
+++ b/src/platform/macos.mm
@@ -60,7 +60,7 @@ extern "C" bool MacGetModes(CGDirectDisplayID display, uint32_t *widths, uint32_
         return false;
     }
     *numModes = CFArrayGetCount(allModes);
-    for (int i = 0; i < *numModes && i < max; i++) {
+    for (uint32_t i = 0; i < *numModes && i < max; i++) {
         CGDisplayModeRef mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(allModes, i);
         widths[i] = (uint32_t)CGDisplayModeGetWidth(mode);
         heights[i] = (uint32_t)CGDisplayModeGetHeight(mode);
@@ -136,7 +136,6 @@ extern "C" bool MacSetMode(CGDirectDisplayID display, uint32_t width, uint32_t h
         return ret;
     }
     int numModes = CFArrayGetCount(allModes);
-    CGDisplayModeRef bestMode = NULL;
     for (int i = 0; i < numModes; i++) {
         CGDisplayModeRef mode = (CGDisplayModeRef)CFArrayGetValueAtIndex(allModes, i);
         if (width == CGDisplayModeGetWidth(mode) &&
diff --git a/src/platform/macos.rs b/src/platform/macos.rs
index 025274840..b663b0f41 100644
--- a/src/platform/macos.rs
+++ b/src/platform/macos.rs
@@ -612,18 +612,18 @@ pub fn resolutions(name: &str) -> Vec<Resolution> {
         unsafe {
             if YES == MacGetModeNum(display, &mut num) {
                 let (mut widths, mut heights) = (vec![0; num as _], vec![0; num as _]);
-                let mut realNum = 0;
+                let mut real_num = 0;
                 if YES
                     == MacGetModes(
                         display,
                         widths.as_mut_ptr(),
                         heights.as_mut_ptr(),
                         num,
-                        &mut realNum,
+                        &mut real_num,
                     )
                 {
-                    if realNum <= num {
-                        for i in 0..realNum {
+                    if real_num <= num {
+                        for i in 0..real_num {
                             let resolution = Resolution {
                                 width: widths[i as usize] as _,
                                 height: heights[i as usize] as _,
diff --git a/src/server/video_service.rs b/src/server/video_service.rs
index a9a9fd9ab..affb5eb17 100644
--- a/src/server/video_service.rs
+++ b/src/server/video_service.rs
@@ -577,6 +577,14 @@ fn run(sp: GenericService) -> ResultType<()> {
         if last_check_displays.elapsed().as_millis() > 1000 {
             last_check_displays = now;
 
+            // Capturer on macos does not return Err event the solution is changed.
+            #[cfg(target_os = "macos")]
+            if check_display_changed(c.ndisplay, c.current, c.width, c.height) {
+                log::info!("Displays changed");
+                *SWITCH.lock().unwrap() = true;
+                bail!("SWITCH");
+            }
+
             if let Some(msg_out) = check_displays_changed() {
                 sp.send(msg_out);
             }
diff --git a/src/ui.rs b/src/ui.rs
index a197cb257..e0449fd95 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -9,7 +9,7 @@ use sciter::Value;
 
 use hbb_common::{
     allow_err,
-    config::{self, LocalConfig, PeerConfig},
+    config::{LocalConfig, PeerConfig},
     log,
 };