From 67b4df1eff614c79bca956615a514bb5bb211af8 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Thu, 23 May 2002 14:27:52 +0000
Subject: merge the sticky window fix from 1.2.

---
 src/openbox.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/openbox.cc')

diff --git a/src/openbox.cc b/src/openbox.cc
index ab88729f..e71b269d 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -1088,7 +1088,10 @@ void Openbox::focusWindow(OpenboxWindow *win) {
   if (win && !win->isIconic()) {
     current_screen = win->getScreen();
     tbar = current_screen->getToolbar();
-    wkspc = current_screen->getWorkspace(win->getWorkspaceNumber());
+    if (win->isStuck())
+      wkspc = current_screen->getCurrentWorkspace();
+    else
+      wkspc = current_screen->getWorkspace(win->getWorkspaceNumber());
     win->setFocusFlag(true);
     wkspc->focusWindow(win);
 
-- 
cgit v1.2.3