Merged from irssi tree

diff --git a/apps/irssi/src/fe-text/gui-windows.c b/apps/irssi/src/fe-text/gui-windows.c
index 9a199cdded559dc24af7bd7c350264dbb378f05b..5d7ad0d734b150b306f74cdf072b46b17580da19 100644 (file)
--- a/apps/irssi/src/fe-text/gui-windows.c
+++ b/apps/irssi/src/fe-text/gui-windows.c
@@ -217,9 +217,10 @@ static MAIN_WINDOW_REC *mainwindow_find_unsticky(void)
         return active_mainwin;
 }
 
-static void signal_window_changed(WINDOW_REC *window, WINDOW_REC *old_window)
+static void signal_window_changed(WINDOW_REC *window)
 {
        MAIN_WINDOW_REC *parent;
+       WINDOW_REC *old_window;
 
        g_return_if_fail(window != NULL);
 
@@ -245,10 +246,11 @@ static void signal_window_changed(WINDOW_REC *window, WINDOW_REC *old_window)
                }
                gui_window_reparent(window, active_mainwin);
        }
-       active_mainwin->active = window;
 
-       if (old_window != NULL && !is_window_visible(old_window))
+       old_window = active_mainwin->active;
+       if (old_window != NULL)
                 textbuffer_view_set_window(WINDOW_GUI(old_window)->view, NULL);
+        active_mainwin->active = window;
 
        textbuffer_view_set_window(WINDOW_GUI(window)->view,
                                   parent->curses_win);