fixed crash in cmd_set (use default trigger instead of NULL if no trigger is set)

diff --git a/src/cmd_neonserv_set.c b/src/cmd_neonserv_set.c
index 452da2e660e2ccf850ccc241e19192274a904841..b9d865ac93571f07be3d136f2c5131d1318a4af4 100644 (file)
--- a/src/cmd_neonserv_set.c
+++ b/src/cmd_neonserv_set.c
@@ -319,10 +319,10 @@ static char* neonserv_cmd_set_trigger(struct ClientSocket *client, struct UserNo
     //get current trigger
     MYSQL_RES *res;
     MYSQL_ROW row;
-    printf_mysql_query("SELECT `trigger` FROM `bot_channels` WHERE `chanid` = '%d' AND `botid` = '%d'", chan->channel_id, client->clientid);
+    printf_mysql_query("SELECT `trigger`, `defaulttrigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botid` = '%d'", chan->channel_id, client->clientid);
     res = mysql_use();
     row = mysql_fetch_row(res);
-    trigger = row[0];
+    trigger = (row[0] ? row[0] : row[1]);
     if(argument) {
         int uaccess = getChannelAccess(user, chan);
         if(uaccess < 500) {