Merge branch 'v0.18.x'

This commit is contained in:
Max Kellermann
2014-08-24 13:20:35 +02:00

@@ -51,6 +51,6 @@ TimeoutMonitor::ScheduleSeconds(unsigned s)
void void
TimeoutMonitor::Run() TimeoutMonitor::Run()
{ {
active = true; active = false;
OnTimeout(); OnTimeout();
} }