Unverified Commit 400cee26 authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5

parents 54c01119 4a8d4913
o Minor bugfixes (mainloop, periodic events):
- Periodic events enabled flag was not unset properly when shutting down tor
cleanly. This had the side effect to not re-enable periodic events when
tor_api.h is used to relaunch tor after a shutdown. Fixes bug 32058;
bugfix on
...@@ -137,6 +137,11 @@ periodic_event_destroy(periodic_event_item_t *event) ...@@ -137,6 +137,11 @@ periodic_event_destroy(periodic_event_item_t *event)
{ {
if (!event) if (!event)
return; return;
/* First disable the event so we first cancel the event and set its enabled
* flag properly. */
mainloop_event_free(event->ev); mainloop_event_free(event->ev);
event->last_action_time = 0; event->last_action_time = 0;
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment