summaryrefslogtreecommitdiff
path: root/openbox/screen.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-10 16:17:57 +0000
committerDana Jansens <danakj@orodu.net>2007-05-10 16:17:57 +0000
commitf969415426c0ae17ecb6c5d2d36802eaaa7bd893 (patch)
treefe40595a434c9535eb92f84647fbd97db0b23a21 /openbox/screen.c
parent1ec4c3dfa8bd35911394ba0f68b07659dc8b3395 (diff)
fix assert happening by combining interactive and non-interactive actions
Diffstat (limited to 'openbox/screen.c')
-rw-r--r--openbox/screen.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/openbox/screen.c b/openbox/screen.c
index a5906d25..9b6a977e 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -659,11 +659,12 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear,
static guint d = (guint)-1;
guint ret;
+ if (d == (guint)-1)
+ d = screen_desktop;
+
if ((cancel || done) && dialog)
goto show_cycle_dialog;
- if (d == (guint)-1)
- d = screen_desktop;
get_row_col(d, &r, &c);
if (linear) {