# HG changeset patch
# User Nicholas Hastings <skamonkey@gmail.com>
# Date 1379989768 14400
# Node ID 81d532b90c864ccc2ad89c25b483309358eed7cd
# Parent  9ad3e662c81156300d1dc8209111522371ed3d5f
Fix watchdog timer hanging on exit (r=dvander).

diff -r 9ad3e662c811 -r 81d532b90c86 sourcepawn/jit/engine2.cpp
--- a/sourcepawn/jit/engine2.cpp	Wed Sep 18 21:49:36 2013 -0400
+++ b/sourcepawn/jit/engine2.cpp	Mon Sep 23 22:29:28 2013 -0400
@@ -192,6 +192,7 @@
 
 void SourcePawnEngine2::Shutdown()
 {
+	g_WatchdogTimer.Shutdown();
 	g_Jit.ShutdownJIT();
 }
 
diff -r 9ad3e662c811 -r 81d532b90c86 sourcepawn/jit/watchdog_timer.cpp
--- a/sourcepawn/jit/watchdog_timer.cpp	Wed Sep 18 21:49:36 2013 -0400
+++ b/sourcepawn/jit/watchdog_timer.cpp	Mon Sep 23 22:29:28 2013 -0400
@@ -31,7 +31,7 @@
 
 WatchdogTimer::~WatchdogTimer()
 {
-  Shutdown();
+  assert(!thread_);
 }
 
 bool