X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fbot_NeonServ.c;h=58dced3a3a428d8d302f9892c9e8a7b0a9167b92;hp=64ba2419b9f4e21852247584821c82feb43afea1;hb=0b17bccd2d7fbef5652168d11d4f0af1f41252d3;hpb=44436a96352a38631237978c9fd431cef3d85cfb

diff --git a/src/bot_NeonServ.c b/src/bot_NeonServ.c
index 64ba241..58dced3 100644
--- a/src/bot_NeonServ.c
+++ b/src/bot_NeonServ.c
@@ -419,10 +419,13 @@ static void neonserv_trigger_callback(int clientid, struct ChanNode *chan, char
         strcpy(trigger, "+");
         return;
     }
-    printf_mysql_query("SELECT `trigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, BOTID);
+    printf_mysql_query("SELECT `trigger`, `defaulttrigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, BOTID);
     res = mysql_use();
     row = mysql_fetch_row(res);
-    strcpy(trigger, ((row && strlen(row[0])) ? row[0] : "+"));
+    if(row[0] && *row[0])
+        strcpy(trigger, row[0]);
+    else
+        strcpy(trigger, ((row[1] && *row[1]) ? row[1] : "~"));
 }
 
 static void start_bots() {