summaryrefslogtreecommitdiff
path: root/src/core/servers-setup.c
diff options
context:
space:
mode:
authorailin-nemui <ailin-nemui@users.noreply.github.com>2016-09-21 15:59:33 +0200
committerailin-nemui <ailin-nemui@users.noreply.github.com>2016-09-21 15:59:33 +0200
commitac73255483a42851db6a54ae4f0d5040e94608a2 (patch)
tree23c38bc6224171640d44be3269053948dd1a92e8 /src/core/servers-setup.c
parent13f4026ae0f0d5422f3163576d4c2eff8754176a (diff)
parentd9b4cb34dccd7fb77e1d222333f3018ff947899c (diff)
downloadirssi-ac73255483a42851db6a54ae4f0d5040e94608a2.zip
Merge branch 'master' into integrate/0.8.20
Diffstat (limited to 'src/core/servers-setup.c')
-rw-r--r--src/core/servers-setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 4a048282..0cecfece 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -321,8 +321,8 @@ server_create_conn(int chat_type, const char *dest, int port,
chatrec = chatnet_find(dest);
if (chatrec != NULL) {
rec = create_chatnet_conn(chatrec->name, port, password, nick);
- if (rec != NULL)
- return rec;
+ /* If rec is NULL the chatnet has no url to connect to */
+ return rec;
}
chatrec = chatnet == NULL ? NULL : chatnet_find(chatnet);