Fix watchdog timer hanging on exit (r=dvander).

2013-09-23 22:29:28 -04:00 · 2013-09-23 22:29:28 -04:00 · 55bf8ec095
commit 55bf8ec095
parent 39e955c412
2 changed files with 2 additions and 1 deletions
--- a/sourcepawn/jit/engine2.cpp
+++ b/sourcepawn/jit/engine2.cpp
@ -192,6 +192,7 @@ bool SourcePawnEngine2::Initialize()

 void SourcePawnEngine2::Shutdown()
 {
+	g_WatchdogTimer.Shutdown();
 	g_Jit.ShutdownJIT();
 }

--- a/sourcepawn/jit/watchdog_timer.cpp
+++ b/sourcepawn/jit/watchdog_timer.cpp
@ -31,7 +31,7 @@ WatchdogTimer::WatchdogTimer()

 WatchdogTimer::~WatchdogTimer()
 {
-  Shutdown();
+  assert(!thread_);
 }

 bool