From: pk910 <philipp@zoelle1.de>
Date: Fri, 23 Dec 2011 21:51:24 +0000 (+0100)
Subject: fixed crash in cmd_set (use default trigger instead of NULL if no trigger is set)
X-Git-Tag: v5.3~108
X-Git-Url: http://git.pk910.de/?a=commitdiff_plain;h=fdca567267cf8843fb71a493b40343d5db3f3c3b;hp=0af12ac9ae9738cbc25931b6355a066c5d48a37f;p=NeonServV5.git

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 452da2e..b9d865a 100644
--- 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) {