Просмотр исходного кода

* Update server list after .set as well, but don't autojump

Bryan Drewery 16 лет назад
Родитель
Сommit
d3e8b946c2
3 измененных файлов с 9 добавлено и 7 удалено
  1. 7 5
      src/chanprog.c
  2. 1 1
      src/chanprog.h
  3. 1 1
      src/set.c

+ 7 - 5
src/chanprog.c

@@ -980,7 +980,7 @@ void notice(const char* target, const char* msg, int idx) {
 }
 
 
-void check_removed_server() {
+void check_removed_server(bool jump_no_match) {
   if (server_online) {
     bool found_server = 0;
 
@@ -1001,10 +1001,12 @@ void check_removed_server() {
     }
 
     if (!found_server) {
-      // Current server not found in new list, jump!
-      putlog(LOG_SERV, "*", "Server removed from list, jumping!");
-      nuke_server("server removed");
-      cycle_time = 0;
+      if (jump_no_match) {
+        // Current server not found in new list, jump!
+        putlog(LOG_SERV, "*", "Server removed from list, jumping!");
+        nuke_server("server removed");
+        cycle_time = 0;
+      }
     } else {
       // Update current server in list.
       curserv = -1;

+ 1 - 1
src/chanprog.h

@@ -34,7 +34,7 @@ void load_internal_users();
 void setup_HQ(int);
 void privmsg(const char* target, const char* msg, int idx);
 void notice(const char* target, const char* msg, int idx);
-void check_removed_server();
+void check_removed_server(bool = 1);
 
 extern struct chanset_t		*chanset, *chanset_default;
 extern char			admin[], origbotnick[HANDLEN + 1], origbotname[NICKLEN], jupenick[NICKLEN], botname[NICKLEN], *def_chanset;

+ 1 - 1
src/set.c

@@ -391,7 +391,7 @@ sdprintf("var (mem): %s -> %s", var->name, datain ? datain : "(NULL)");
     if (data)
       add_server(data);
 
-    curserv = 999; /* Will get updated after userfile is loaded */
+    check_removed_server(0);
   }
 
   if (datap)