summaryrefslogtreecommitdiff
path: root/src/fe-common/core
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2002-06-06 23:40:37 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2002-06-06 23:40:37 +0000
commitda1252cf2c3cdc8adf6827197346996754ceb50b (patch)
tree69fd71c72036b5653cf2514097a93ccb43c1746a /src/fe-common/core
parent191db0589360b0ca0f8d998810b8908b6f7f9502 (diff)
downloadirssi-da1252cf2c3cdc8adf6827197346996754ceb50b.zip
/NAMES list isn't displayed on join when channel is joined because of
/UPGRADE. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2848 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/core')
-rw-r--r--src/fe-common/core/fe-channels.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 9f0081c8..ee60a425 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -105,7 +105,8 @@ static void signal_window_item_changed(WINDOW_REC *window, WI_ITEM_REC *item)
static void sig_channel_joined(CHANNEL_REC *channel)
{
- if (settings_get_bool("show_names_on_join"))
+ if (settings_get_bool("show_names_on_join") &&
+ !channel->session_rejoin)
fe_channels_nicklist(channel, CHANNEL_NICKLIST_FLAG_ALL);
}