Merge branch 'master' into next

2011-08-07 20:45:20 +02:00 · 2011-08-07 20:45:20 +02:00 · e304902874
parent 8b9ba5fd0b 6fb5d6e313
commit e304902874
1 changed files with 1 additions and 1 deletions
--- a/src/con.c
+++ b/src/con.c
@ -781,7 +781,7 @@ Con *con_descend_tiling_focused(Con *con) {
 *
 */
 Con *con_descend_direction(Con *con, direction_t direction) {
-    Con *most;
+    Con *most = NULL;
    DLOG("con_descend_direction(%p, %d)\n", con, direction);
    if (direction == D_LEFT || direction == D_RIGHT) {
        if (con->orientation == HORIZ) {