X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Foutput.c;h=b037335a02621d3fa4ae9eefa187f7925635ec6b;hb=92000942039fa99d7334ca5099b467b0d3d17792;hp=a54cb6f35fb54ace23ff77faf2011083eb77343e;hpb=0adbffb38621192c416ac52aa6b82ac57fb6394d;p=i3%2Fi3

diff --git a/src/output.c b/src/output.c
index a54cb6f3..b037335a 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,8 +1,10 @@
+#undef I3__FILE__
+#define I3__FILE__ "output.c"
 /*
  * 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.
  *
@@ -16,10 +18,9 @@
 Con *output_get_content(Con *output) {
     Con *child;
 
-    TAILQ_FOREACH(child, &(output->nodes_head), nodes)
+    TAILQ_FOREACH (child, &(output->nodes_head), nodes)
         if (child->type == CT_CON)
             return child;
 
-    ELOG("output_get_content() called on non-output %p\n", output);
-    assert(false);
+    return NULL;
 }