Merge branch 'master' into next

[i3/i3] / src / output.c

diff --git a/src/output.c b/src/output.c
index fe8d49837adc0dc3c517850dc0dc705ade1f7694..6499c65df77d46dea56fb8c75b432ebedb1dad61 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.
  *
@@ -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;
 }