summaryrefslogtreecommitdiff
path: root/src/fe-common/irc
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2000-08-10 11:25:34 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2000-08-10 11:25:34 +0000
commitd1a25e0fc2342718cd03666cc98becd134f4c679 (patch)
tree0433ba2bdf71301397982528016dcf7c7192681a /src/fe-common/irc
parentbcd7b636ed7a9931199ef8ab7c642be57b04bae9 (diff)
downloadirssi-d1a25e0fc2342718cd03666cc98becd134f4c679.zip
Don't autoclose window after part/unquery if there was still some
channels/queries left in window. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@575 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/irc')
-rw-r--r--src/fe-common/irc/fe-channels.c3
-rw-r--r--src/fe-common/irc/fe-query.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/fe-common/irc/fe-channels.c b/src/fe-common/irc/fe-channels.c
index 9a87bd79..64b07fa7 100644
--- a/src/fe-common/irc/fe-channels.c
+++ b/src/fe-common/irc/fe-channels.c
@@ -60,7 +60,8 @@ static void signal_channel_destroyed(CHANNEL_REC *channel)
if (window != NULL) {
window_remove_item(window, (WI_ITEM_REC *) channel);
- if (windows->next != NULL && (!channel->joined || channel->left) &&
+ if (window->items == NULL && windows->next != NULL &&
+ (!channel->joined || channel->left) &&
settings_get_bool("autoclose_windows")) {
window_destroy(window);
}
diff --git a/src/fe-common/irc/fe-query.c b/src/fe-common/irc/fe-query.c
index a7643d55..ee1505bd 100644
--- a/src/fe-common/irc/fe-query.c
+++ b/src/fe-common/irc/fe-query.c
@@ -74,8 +74,8 @@ static void signal_query_destroyed(QUERY_REC *query)
if (window != NULL) {
window_remove_item(window, (WI_ITEM_REC *) query);
- if (windows->next != NULL && !query->unwanted &&
- settings_get_bool("autoclose_windows"))
+ if (window->items == NULL && windows->next != NULL &&
+ !query->unwanted && settings_get_bool("autoclose_windows"))
window_destroy(window);
}
}