Unverified Commit 77c85360 authored by teor's avatar teor
Browse files

Merge branch 'maint-0.4.2'

parents 3539fdfd 04e9e74f

changes/ticket32058

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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 0.3.3.1-alpha.

src/core/mainloop/periodic.c

+5 −0
Original line number Diff line number Diff line
@@ -153,6 +153,11 @@ periodic_event_disconnect(periodic_event_item_t *event) 
{

  if (!event)

    return;



  /* First disable the event so we first cancel the event and set its enabled

   * flag properly. */

  periodic_event_disable(event);



  mainloop_event_free(event->ev);

  event->last_action_time = 0;

}