From: Mikael Magnusson <mikachu@comhem.se>
Date: Sat, 4 Aug 2007 01:57:58 +0000 (+0200)
Subject: Remove edge switching timer before adding it again.
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=f94fe1b84749ff876dbb6643379dc3db5ad8941a;p=chaz%2Fopenbox

Remove edge switching timer before adding it again.
---

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index bfa0feb0..1a8550a9 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -526,9 +526,8 @@ static void do_edge_warp(gint x, gint y)
     }
 
     if (dir != edge_warp_dir) {
-        if (dir == (ObDirection)-1)
-            cancel_edge_warp();
-        else {
+        cancel_edge_warp();
+        if (dir != (ObDirection)-1) {
             edge_warp_odd = TRUE; /* switch on the first timeout */
             ob_main_loop_timeout_add(ob_main_loop,
                                      config_mouse_screenedgetime * 1000,