From 1c2cfc1480a590ef6ac77812ea58eb5be0825961 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 10 May 2007 16:18:13 +0000 Subject: [PATCH] merge r6293 from trunk --- openbox/screen.c | 5 +++-- 1 file 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) { -- 2.34.1