src/usr.bin/tmux/cmd-break-pane.c - diff

Return to cmd-break-pane.c CVS log

Up to [local] / src / usr.bin / tmux

-version 1.10, 2011/01/04 00:42:46
+version 1.11, 2011/05/08 21:30:00
 Line 57
 Line 57
 Line 57
                  return (-1);
          }
-         TAILQ_REMOVE(&wl->window->panes, wp, entry);
+         w = wl->window;
-         if (wl->window->active == wp) {
+         TAILQ_REMOVE(&w->panes, wp, entry);
-                 wl->window->active = TAILQ_PREV(wp, window_panes, entry);
+         if (wp == w->active) {
-                 if (wl->window->active == NULL)
+                 w->active = w->last;
-                         wl->window->active = TAILQ_NEXT(wp, entry);
+                 w->last = NULL;
-         }
+                 if (w->active == NULL) {
+                         w->active = TAILQ_PREV(wp, window_panes, entry);
+                         if (w->active == NULL)
+                                 w->active = TAILQ_NEXT(wp, entry);
+                 }
+         } else if (wp == w->last)
+                 w->last = NULL;
          layout_close_pane(wp);
          w = wp->window = window_create1(s->sx, s->sy);