fix two more crashes when disabling an empty output

diff --git a/src/output.c b/src/output.c
index fe8d49837adc0dc3c517850dc0dc705ade1f7694..1a1a5c460af0b5c6d1d9e01040785eeaa6434454 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -4,7 +4,7 @@
  * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
+ * © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE)
  *
  * output.c: Output (monitor) related functions.
  *
@@ -22,6 +22,5 @@ Con *output_get_content(Con *output) {
         if (child->type == CT_CON)
             return child;
 
-    ELOG("output_get_content() called on non-output %p\n", output);
-    assert(false);
+    return NULL;
 }

diff --git a/src/render.c b/src/render.c
index a0d66d8256835bcff30a6d4d4fdec2f8d5884670..85347c4cf7ad9997bd4e1a07bc63a507e2700770 100644 (file)
--- a/src/render.c
+++ b/src/render.c
@@ -44,7 +44,10 @@ static void render_l_output(Con *con) {
         }
     }
 
-    assert(content != NULL);
+    if (content == NULL) {
+        DLOG("Skipping this output because it is currently being destroyed.\n");
+        return;
+    }
 
     /* We need to find out if there is a fullscreen con on the current workspace
      * and take the short-cut to render it directly (the user does not want to