X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fbots.c;h=9cc84d259f430fd881fde5f126220ccd2bbf45be;hp=e22b768bde400c72a3c0fd090d2ed04bc52bf7b8;hb=0b17bccd2d7fbef5652168d11d4f0af1f41252d3;hpb=44436a96352a38631237978c9fd431cef3d85cfb

diff --git a/src/bots.c b/src/bots.c
index e22b768..9cc84d2 100644
--- a/src/bots.c
+++ b/src/bots.c
@@ -83,10 +83,13 @@ static void zero_bots_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` = '0' AND `botid` = '%d'", chan->channel_id, clientid);
+    printf_mysql_query("SELECT `trigger`, `defaulttrigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '0' AND `botid` = '%d'", chan->channel_id, clientid);
     res = mysql_use();
     row = mysql_fetch_row(res);
-    strcpy(trigger, (strlen(row[0]) ? row[0] : "+"));
+    if(row[0] && *row[0])
+        strcpy(trigger, row[0]);
+    else
+        strcpy(trigger, ((row[1] && *row[1]) ? row[1] : "+"));
 }
 
 void init_bots() {