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

* Don't share cfg changes in trigger_cfg_changed (reading userfile for our own LOCAL cfg entries)

svn: 2090
Bryan Drewery 21 лет назад
Родитель
Сommit
df12bee8af
2 измененных файлов с 4 добавлено и 1 удалено
  1. 3 0
      src/cfg.c
  2. 1 1
      src/mod/share.mod/share.c

+ 3 - 0
src/cfg.c

@@ -798,6 +798,8 @@ void trigger_cfg_changed()
   int i;
   int i;
   struct xtra_key *xk = NULL;
   struct xtra_key *xk = NULL;
 
 
+  /* look for local cfgs inside our own USERENTRY_CONFIG and set them in our cfg struct */
+  cfg_noshare = 1;			/* why bother sharing out our LOCAL cfg settings? */
   for (i = 0; i < cfg_count; i++) {
   for (i = 0; i < cfg_count; i++) {
     if (cfg[i]->flags & CFGF_LOCAL) {
     if (cfg[i]->flags & CFGF_LOCAL) {
       xk = (struct xtra_key *) get_user(&USERENTRY_CONFIG, conf.bot->u);
       xk = (struct xtra_key *) get_user(&USERENTRY_CONFIG, conf.bot->u);
@@ -811,4 +813,5 @@ void trigger_cfg_changed()
       }
       }
     }
     }
   }
   }
+  cfg_noshare = 0;
 }
 }

+ 1 - 1
src/mod/share.mod/share.c

@@ -1273,7 +1273,7 @@ finish_share(int idx)
   Auth::FillUsers();
   Auth::FillUsers();
 
 
   checkchans(1);                /* remove marked channels */
   checkchans(1);                /* remove marked channels */
-  trigger_cfg_changed();
+  trigger_cfg_changed();	/* Set our local cfg settings from our userentry */
   reaffirm_owners();            /* Make sure my owners are +a   */
   reaffirm_owners();            /* Make sure my owners are +a   */
   updatebot(-1, dcc[j].nick, '+', 0, 0, NULL);
   updatebot(-1, dcc[j].nick, '+', 0, 0, NULL);
 }
 }