Merged with Irssi 0.8.6.

[silc.git] / apps / irssi / src / fe-common / core / window-commands.c

diff --git a/apps/irssi/src/fe-common/core/window-commands.c b/apps/irssi/src/fe-common/core/window-commands.c
index a8f3bb1066bd2835023e03842e73572d858c2f85..fbfacd8540964dd4e1074b44eb9fc4d2220f1820 100644 (file)
--- a/apps/irssi/src/fe-common/core/window-commands.c
+++ b/apps/irssi/src/fe-common/core/window-commands.c
@@ -531,7 +531,10 @@ static void cmd_window_number(const char *data)
 /* SYNTAX: WINDOW NAME <name> */
 static void cmd_window_name(const char *data)
 {
-       if (window_find_name(data) == NULL)
+       WINDOW_REC *win;
+
+       win = window_find_name(data);
+       if (win == NULL || win == active_win)
                window_set_name(active_win, data);
        else if (active_win->name == NULL ||
                 strcmp(active_win->name, data) != 0) {