From: Michael Stapelberg <michael+x200@stapelberg.de>
Date: Fri, 10 Apr 2009 19:29:25 +0000 (+0200)
Subject: Bugfix: Don’t crash anymore when moving focus to another screen (Thanks, Mirko!)
X-Git-Tag: 3.a-bf1~50
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aace42cd7a23b7c0c6116b9591e00d4998858e06;p=i3%2Fi3

Bugfix: Don’t crash anymore when moving focus to another screen (Thanks, Mirko!)

This fixes ticket #24. The crash appeared only under special conditions:
- The screen on which you switch to must be empty or at least not as
  full as the screen on which you were before.
- You switch focus using your mouse.
- You previously selected a column/row which is not availably on the
  destination screen (for example (1,1) and switching to an empty
  screen).
---

diff --git a/src/handlers.c b/src/handlers.c
index faca13bc..47766623 100644
--- a/src/handlers.c
+++ b/src/handlers.c
@@ -173,7 +173,11 @@ int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_
                         LOG("ERROR: No such screen\n");
                         return 0;
                 }
+                c_ws->current_row = current_row;
+                c_ws->current_col = current_col;
                 c_ws = &workspaces[screen->current_workspace];
+                current_row = c_ws->current_row;
+                current_col = c_ws->current_col;
                 LOG("We're now on virtual screen number %d\n", screen->num);
                 return 1;
         }