From a25f11125abe3088e4cef3015942bf335dbb8525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Mon, 3 Mar 2003 18:08:46 +0000
Subject: [PATCH] Fix #55164. CCMAIL: 55164-done@bugs.kde.org

svn path=/trunk/kdebase/kwin/; revision=211101
---
 workspace.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/workspace.cpp b/workspace.cpp
index fdc9838aa5..c94a856251 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -2306,9 +2306,11 @@ void Workspace::setCurrentDesktop( int new_desktop ){
 
         ObscuringWindows obs_wins;
 
+	bool updateMovingClientDesktop = false;
         if (d->movingClient && !d->movingClient->isSticky())
         {
-            d->movingClient->setDesktop(-1); // All desktops
+	    updateMovingClientDesktop = true;
+            d->movingClient->setDesktop( -1 );
         }
 
         for ( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it) {
@@ -2326,7 +2328,7 @@ void Workspace::setCurrentDesktop( int new_desktop ){
             }
         }
 
-        if (d->movingClient && !d->movingClient->isSticky())
+        if (d->movingClient && updateMovingClientDesktop )
         {
             d->movingClient->setDesktop(new_desktop);
         }