philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't check notifies if the interval is zero, even if the clock has gone backwards

Browse Source
This commit is contained in:
Kevin Easton
2017-05-30 22:52:42 +10:00
parent 09ab7a2130
commit 09395464ff
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/notify.c
View File

@@ -336,21 +336,21 @@ BUILT_IN_COMMAND(notify)
*/ */
void do_notify(void) void do_notify(void)
{ {
int old_from_server = from_server; static time_t last_notify = 0;
const int old_from_server = from_server;
const int interval = get_int_var(NOTIFY_INTERVAL_VAR);
int servnum; int servnum;
static time_t last_notify = 0;
int interval = get_int_var(NOTIFY_INTERVAL_VAR);
time_t current_time = time(NULL); time_t current_time = time(NULL);
if (current_time < last_notify) if (!interval || !get_int_var(NOTIFY_VAR))
last_notify = current_time; return;
else if (!interval || interval > (current_time - last_notify))
if ((current_time > last_notify) && (interval > (current_time - last_notify)))
return; /* Not yet */ return; /* Not yet */
last_notify = current_time; last_notify = current_time;
if (!server_list_size() || !get_int_var(NOTIFY_VAR))
return;
for (servnum = 0; servnum < server_list_size(); servnum++) for (servnum = 0; servnum < server_list_size(); servnum++)
{ {
if (is_server_connected(servnum) && !get_server_watch(servnum)) if (is_server_connected(servnum) && !get_server_watch(servnum))