map to the highest possible desktop if a desktop too large is requested

diff --git a/src/client.cc b/src/client.cc
index e991639bb8d92db4e1dd4c1c647856cf9a136831..2e78cb7672ff439db78dce1eb6f0f3a219b332dd 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -155,9 +155,11 @@ void Client::getDesktop()
 
   if (otk::Property::get(_window, otk::Property::atoms.net_wm_desktop,
                          otk::Property::atoms.cardinal,
-                         (long unsigned*)&d) &&
-      d < openbox->screen(_screen)->numDesktops()) {
-      _desktop = d;
+                         (long unsigned*)&d)) {
+    if (d >= openbox->screen(_screen)->numDesktops() &&
+        d != 0xffffffff)
+      d = openbox->screen(_screen)->numDesktops() - 1;
+    _desktop = d;
 #ifdef DEBUG
 //    printf("Window requested desktop: %ld\n", _desktop);
 #endif