X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Foutput.c;h=6499c65df77d46dea56fb8c75b432ebedb1dad61;hb=dd5be77d1dcc7e7eb40ce1c33f985816fc0b8f79;hp=fe8d49837adc0dc3c517850dc0dc705ade1f7694;hpb=65e5bcfdf4c44845dadf057a6bde1f15db3381ff;p=i3%2Fi3

diff --git a/src/output.c b/src/output.c
index fe8d4983..6499c65d 100644
--- 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.
  *
@@ -19,9 +19,8 @@ Con *output_get_content(Con *output) {
     Con *child;
 
     TAILQ_FOREACH(child, &(output->nodes_head), nodes)
-        if (child->type == CT_CON)
-            return child;
+    if (child->type == CT_CON)
+        return child;
 
-    ELOG("output_get_content() called on non-output %p\n", output);
-    assert(false);
+    return NULL;
 }