summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2008-02-09 11:43:26 +0100
committerMikael Magnusson <mikachu@comhem.se>2008-02-09 11:43:26 +0100
commit10cabdfe8570963bd0ed12c4aca8ad469ba3d4ea (patch)
tree74fb22a6e509efd5a222d4b284218f3038da6947 /openbox
parentd9d580e0382ee11127c1f4a0691b6279b9e0dc67 (diff)
Fix a minor issue with lastdesktop right after startup.
Diffstat (limited to 'openbox')
-rw-r--r--openbox/screen.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/openbox/screen.c b/openbox/screen.c
index fcd0de8c..91353538 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -606,10 +606,15 @@ void screen_set_desktop(guint num, gboolean dofocus)
/* If screen_desktop_timeout is true, then we've been on this desktop
long enough and we can save it as the last desktop. */
- /* save the "last desktop" as the "old desktop" */
- screen_old_desktop = screen_last_desktop;
- /* save the desktop we're coming from as the "last desktop" */
- screen_last_desktop = previous;
+ if (screen_last_desktop == previous)
+ /* this is the startup state only */
+ screen_old_desktop = screen_desktop;
+ else {
+ /* save the "last desktop" as the "old desktop" */
+ screen_old_desktop = screen_last_desktop;
+ /* save the desktop we're coming from as the "last desktop" */
+ screen_last_desktop = previous;
+ }
}
else {
/* If screen_desktop_timeout is false, then we just got to this desktop