Added SILC Thread Queue API

[crypto.git] / apps / irssi / src / fe-common / core / fe-expandos.c

diff --git a/apps/irssi/src/fe-common/core/fe-expandos.c b/apps/irssi/src/fe-common/core/fe-expandos.c
index 7eb145dbd31e721e8c7671eff8edc6046ab433ea..c14ac7c3e51f5ad9ab58604530c76f5c72902bec 100644 (file)
--- a/apps/irssi/src/fe-common/core/fe-expandos.c
+++ b/apps/irssi/src/fe-common/core/fe-expandos.c
@@ -25,6 +25,9 @@
 /* Window ref# */
 static char *expando_winref(SERVER_REC *server, void *item, int *free_ret)
 {
+       if (active_win == NULL)
+               return "";
+
         *free_ret = TRUE;
        return g_strdup_printf("%d", active_win->refnum);
 }
@@ -32,6 +35,9 @@ static char *expando_winref(SERVER_REC *server, void *item, int *free_ret)
 /* Window name */
 static char *expando_winname(SERVER_REC *server, void *item, int *free_ret)
 {
+       if (active_win == NULL)
+               return "";
+
        return active_win->name;
 }
 
@@ -41,6 +47,7 @@ void fe_expandos_init(void)
                       "window changed", EXPANDO_ARG_NONE,
                       "window refnum changed", EXPANDO_ARG_WINDOW, NULL);
        expando_create("winname", expando_winname,
+                      "window changed", EXPANDO_ARG_NONE,
                       "window name changed", EXPANDO_ARG_WINDOW, NULL);
 }