Fix watchdog timer hanging on exit (r=dvander).
authorNicholas Hastings <skamonkey@gmail.com>
Mon Sep 23 22:29:28 2013 -0400 (2013-09-23)
changeset 412981d532b90c86
parent 4128 9ad3e662c811
child 4130 8eaa746585d2
Fix watchdog timer hanging on exit (r=dvander).
sourcepawn/jit/engine2.cpp
sourcepawn/jit/watchdog_timer.cpp
     1.1 --- a/sourcepawn/jit/engine2.cpp	Wed Sep 18 21:49:36 2013 -0400
     1.2 +++ b/sourcepawn/jit/engine2.cpp	Mon Sep 23 22:29:28 2013 -0400
     1.3 @@ -192,6 +192,7 @@
     1.4  
     1.5  void SourcePawnEngine2::Shutdown()
     1.6  {
     1.7 +	g_WatchdogTimer.Shutdown();
     1.8  	g_Jit.ShutdownJIT();
     1.9  }
    1.10  
     2.1 --- a/sourcepawn/jit/watchdog_timer.cpp	Wed Sep 18 21:49:36 2013 -0400
     2.2 +++ b/sourcepawn/jit/watchdog_timer.cpp	Mon Sep 23 22:29:28 2013 -0400
     2.3 @@ -31,7 +31,7 @@
     2.4  
     2.5  WatchdogTimer::~WatchdogTimer()
     2.6  {
     2.7 -  Shutdown();
     2.8 +  assert(!thread_);
     2.9  }
    2.10  
    2.11  bool