From: Pekka Riikonen <priikone@silcnet.org>
Date: Mon, 4 Jun 2001 12:57:12 +0000 (+0000)
Subject: 	Merged from irssi tree
X-Git-Tag: robodoc-323~240
X-Git-Url: http://git.silc.fi/gitweb/?a=commitdiff_plain;h=8fafe3774a5bc05d38a4cb61767cc212e8421636;p=silc.git

	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 9a199cdd..5d7ad0d7 100644
--- 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);