From 9dc621672984bf77802397b0af4105be144bb7aa Mon Sep 17 00:00:00 2001
From: Lucas Murray <lmurray@undefinedfire.com>
Date: Tue, 25 Nov 2008 03:23:59 +0000
Subject: [PATCH] Correct implementation of r886439. BUG: 136949

svn path=/trunk/KDE/kdebase/workspace/; revision=888667
---
 client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client.cpp b/client.cpp
index a4c664adfe..e924b70878 100644
--- a/client.cpp
+++ b/client.cpp
@@ -1209,7 +1209,7 @@ void Client::setDesktop( int desktop )
     {
     if( desktop != NET::OnAllDesktops ) // do range check
         desktop = qMax( 1, qMin( workspace()->numberOfDesktops(), desktop ));
-    desktop = rules()->checkDesktop( desktop );
+    desktop = qMin( workspace()->numberOfDesktops(), rules()->checkDesktop( desktop ));
     if( desk == desktop )
         return;
     int was_desk = desk;