X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fcore%2Fchatnets.c;fp=apps%2Firssi%2Fsrc%2Fcore%2Fchatnets.c;h=376fab58d5692e83a9c45a7c89e1c0f7ac973489;hb=18d69a0a1fec438e241bb4f431506ed59a34066b;hp=9e43f859a81ec01335017d8b3f6644b1c3ff8452;hpb=f7be6adec0248118cddde9b04522c13cd90568cd;p=silc.git

diff --git a/apps/irssi/src/core/chatnets.c b/apps/irssi/src/core/chatnets.c
index 9e43f859..376fab58 100644
--- a/apps/irssi/src/core/chatnets.c
+++ b/apps/irssi/src/core/chatnets.c
@@ -13,9 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "module.h"
@@ -118,12 +118,11 @@ static void sig_connected(SERVER_REC *server)
 
 	g_return_if_fail(IS_SERVER(server));
 
-	if (server->connrec->chatnet == NULL || server->session_reconnect ||
-	    server->connrec->no_autojoin_channels)
+	if (server->connrec->chatnet == NULL || server->session_reconnect)
 		return;
 
 	rec = chatnet_find(server->connrec->chatnet);
-	if (rec != NULL && rec->autosendcmd)
+	if (!server->connrec->no_autosendcmd && rec != NULL && rec->autosendcmd)
 		eval_special_string(rec->autosendcmd, "", server, NULL);
 }