From 187208764216b2a41a98fd3c839dfe9f6a214368 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <cras@irssi.org>
Date: Sat, 23 Mar 2002 17:42:48 +0000
Subject: [PATCH] $topic shouldn't crash if query doesn't have a valid address
 set yet.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2639 dbcabf3a-b0e7-0310-adc4-f8d773084564
---
 src/core/expandos.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/core/expandos.c b/src/core/expandos.c
index c5711f91..130d6025 100644
--- a/src/core/expandos.c
+++ b/src/core/expandos.c
@@ -436,9 +436,14 @@ static char *expando_topic(SERVER_REC *server, void *item, int *free_ret)
 	if (IS_QUERY(item)) {
 		QUERY_REC *query = QUERY(item);
 
+		if (query->server_tag == NULL)
+			return "";
+
                 *free_ret = TRUE;
-		return g_strdup_printf("%s (%s)", query->address,
-				       query->server_tag);
+		return query->address == NULL ?
+			g_strdup_printf("(%s)", query->server_tag) :
+			g_strdup_printf("%s (%s)", query->address,
+					query->server_tag);
 	}
         return "";
 }