X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=d368cab68ca8a5d76adeca13ce874486076d6b51;hb=e4e7c2be52ee1a0b75d9d2feff57fdc992fedb9b;hp=a94347edf0f025b8c09267ecb78b50b0371307c0;hpb=d3660704f1195fb724f5c0c027bdd084824c511f;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index a94347ed..d368cab6 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -1652,7 +1652,7 @@ guint screen_find_monitor(const Rect *search)
             }
         }
     }
-    return most;
+    return most < screen_num_monitors ? most : screen_monitor_primary(FALSE);
 }
 
 const Rect* screen_physical_area_all_monitors(void)
@@ -1753,3 +1753,12 @@ gboolean screen_pointer_pos(gint *x, gint *y)
     }
     return ret;
 }
+
+gboolean screen_compare_desktops(guint a, guint b)
+{
+    if (a == DESKTOP_ALL)
+        a = screen_desktop;
+    if (b == DESKTOP_ALL)
+        b = screen_desktop;
+    return a == b;
+}