Merged Irssi SVN (upcoming irssi 0.8.11).

[silc.git] / apps / irssi / src / fe-common / core / windows-layout.c

diff --git a/apps/irssi/src/fe-common/core/windows-layout.c b/apps/irssi/src/fe-common/core/windows-layout.c
index 9429c00ae6236d78e3a116f621e0b915bdcb8c35..223b65244c7dcbfc6695405744a204baa0a3f116 100644 (file)
--- a/apps/irssi/src/fe-common/core/windows-layout.c
+++ b/apps/irssi/src/fe-common/core/windows-layout.c
@@ -61,12 +61,25 @@ static void sig_layout_restore_item(WINDOW_REC *window, const char *type,
                WINDOW_BIND_REC *rec = window_bind_add(window, tag, name);
                 rec->sticky = TRUE;
        } else if (g_strcasecmp(type, "QUERY") == 0 && chat_type != NULL) {
+               CHAT_PROTOCOL_REC *protocol;
                /* create query immediately */
                signal_add("query created",
                           (SIGNAL_FUNC) signal_query_created_curwin);
 
                 restore_win = window;
-               chat_protocol_find(chat_type)->query_create(tag, name, TRUE);
+               
+               protocol = chat_protocol_find(chat_type);
+               if (protocol->query_create != NULL)
+                       protocol->query_create(tag, name, TRUE);
+               else {
+                       QUERY_REC *query;
+
+                       query = g_new0(QUERY_REC, 1);
+                       query->chat_type = chat_protocol_lookup(chat_type);
+                       query->name = g_strdup(name);
+                       query->server_tag = g_strdup(tag);
+                       query_init(query, TRUE);
+               }
 
                signal_remove("query created",
                              (SIGNAL_FUNC) signal_query_created_curwin);