Make sure the created favchannel instances have a NULL key when the session's key is empty

1 files changed, 9 insertions, 1 deletions

diff --git a/src/common/inbound.c b/src/common/inbound.c
index 2f33199a..07539a63 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -1105,7 +1105,15 @@ check_autojoin_channels (server *serv)
 					}
 				}
 
-				sess_channels = servlist_favchan_listadd (sess_channels, sess->waitchannel, sess->channelkey);
+				/* for easier checks, ensure that favchannel->key is just NULL when session->channelkey is empty i.e. '' */
+				if (strlen (sess->channelkey))
+				{
+					sess_channels = servlist_favchan_listadd (sess_channels, sess->waitchannel, sess->channelkey);
+				}
+				else
+				{
+					sess_channels = servlist_favchan_listadd (sess_channels, sess->waitchannel, NULL);
+				}
 				i++;
 			}
 		}