diff options
| author | Dana Jansens <danakj@orodu.net> | 2002-05-23 14:27:52 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2002-05-23 14:27:52 +0000 |
| commit | 67b4df1eff614c79bca956615a514bb5bb211af8 (patch) | |
| tree | 56f72fe3bed7251558ab8bff0961acb10cecffbc /src/Screen.cc | |
| parent | a25b213aff1ec7450b5d61c20cf3c8e0f918ee28 (diff) | |
merge the sticky window fix from 1.2.
Diffstat (limited to 'src/Screen.cc')
| -rw-r--r-- | src/Screen.cc | 8 |
1 files changed, 3 insertions, 5 deletions
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); |