summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2007-08-04 03:57:58 +0200
committerMikael Magnusson <mikachu@comhem.se>2007-08-04 13:21:25 +0200
commitf94fe1b84749ff876dbb6643379dc3db5ad8941a (patch)
treef445e95f4b968a5f0effc26a10bc29f019e1ca7b
parentb6b9124ad09d05dfd25ea31cf4607edd45541254 (diff)
Remove edge switching timer before adding it again.
-rw-r--r--openbox/moveresize.c5
1 files changed, 2 insertions, 3 deletions
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,