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/Screen.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/Screen.cc')

diff --git a/src/Screen.cc b/src/Screen.cc
index 175d966d..08b76971 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1976,11 +1976,9 @@ void BScreen::load() {
       workspacemenu->setItemSelected(current_workspace->getWorkspaceID() + 2,
                                      False);
 
-      if (openbox.focusedWindow() &&
-          openbox.focusedWindow()->getScreen() == this &&
-          (! openbox.focusedWindow()->isStuck())) {
-        openbox.focusWindow(0);
-      }
+    OpenboxWindow *fw = openbox.focusedWindow();
+    if (fw && fw->getScreen() == this)
+      openbox.focusWindow(0);
 
       current_workspace = getWorkspace(id);
 
-- 
cgit v1.2.3