]> git.sur5r.net Git - i3/i3/commitdiff
Remove asserts and return non-match instead if the container or its workspace cannot... 1776/head
authorIngo Bürk <ingo.buerk@tngtech.com>
Wed, 1 Jul 2015 09:47:55 +0000 (11:47 +0200)
committerIngo Bürk <ingo.buerk@tngtech.com>
Wed, 1 Jul 2015 09:47:55 +0000 (11:47 +0200)
This can cause an issue if used in combination with for_window and i3bar during startup of i3 otherwise.

fixes #1774

src/match.c

index 03a9cbee32c161f1c98b931e437abe0b93d6ab7b..b95cf2342bf61bbebdd90c7aebb5c4e9de89e39d 100644 (file)
@@ -175,10 +175,12 @@ bool match_matches_window(Match *match, i3Window *window) {
     }
 
     if (match->workspace != NULL) {
-        Con *con = con_by_window_id(window->id);
-        assert(con != NULL);
+        if ((con = con_by_window_id(window->id)) == NULL)
+            return false;
+
         Con *ws = con_get_workspace(con);
-        assert(ws != NULL);
+        if (ws == NULL)
+            return false;
 
         if (regex_matches(match->workspace, ws->name)) {
             LOG("workspace matches (%s)\n", ws->name);