-botcmd isn't now sent to channels when /UPGRADEing.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2078 dbcabf3a-b0e7-0310-adc4-f8d773084564

src/core/channel-rec.h

@@ -22,6 +22,7 @@ unsigned int synced:1; /* Channel synced - all queries done */
 unsigned int joined:1; /* Have we even received JOIN event for this channel? */
 unsigned int left:1; /* You just left the channel */
 unsigned int kicked:1; /* You just got kicked */
+unsigned int session_rejoin:1; /* This channel was joined with /UPGRADE */
 unsigned int destroying:1;
 
 /* Return the information needed to call SERVER_REC->channels_join() for

src/core/channels.c

@@ -199,6 +199,9 @@ void channel_send_autocommands(CHANNEL_REC *channel)
 
 	g_return_if_fail(IS_CHANNEL(channel));
 
+	if (channel->session_rejoin)
+                return;
+
 	rec = channel_setup_find(channel->name, channel->server->connrec->chatnet);
 	if (rec == NULL || rec->autosendcmd == NULL || !*rec->autosendcmd)
 		return;

src/irc/core/irc-session.c

@@ -72,6 +72,7 @@ static void sig_connected(IRC_SERVER_REC *server)
 	for (tmp = server->channels; tmp != NULL; tmp = tmp->next) {
 		CHANNEL_REC *rec = tmp->data;
 
+                rec->session_rejoin = TRUE;
 		signal_emit("event join", 4, server, rec->name,
 			    server->nick, server->userhost);
                 irc_send_cmdv(server, "TOPIC %s", rec->name);