Changeset aab7af1 for window.c

Timestamp:

Jun 3, 2010, 1:29:56 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

d7c1dbe

Parents:

e8128c5

Message:

Make unlinked handling more explicit

File:

• window.c (modified) (1 diff)

window.c

@@ -229 +229 @@
     resizeterm(w->nlines, w->ncols);
     w->win = stdscr;
-  } else if (w->pan) {
-    w->win = newwin(w->nlines, w->ncols, w->begin_y, w->begin_x);
-    replace_panel(w->pan, w->win);
   } else {
+    /* Explicitly disallow realizing an unlinked non-root */
     if (w->parent == NULL || w->parent->win == NULL)
       return;
-    w->win = derwin(w->parent->win, w->nlines, w->ncols, w->begin_y, w->begin_x);
+    if (w->pan) {
+      w->win = newwin(w->nlines, w->ncols, w->begin_y, w->begin_x);
+      replace_panel(w->pan, w->win);
+    } else {
+      w->win = derwin(w->parent->win, w->nlines, w->ncols, w->begin_y, w->begin_x);
+    }
   }
 }