Merge pull request #713 from bunnei/qt-emuthread-fixes

Fix emulation state resetting to support multiple emulation sessions

1 files changed, 10 insertions, 0 deletions

diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index 6f716b1c..f70c84c3 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -160,6 +160,16 @@ void Init() {
     last_global_time_us = 0;
     has_ts_events = 0;
     mhz_change_callbacks.clear();
+
+    first = nullptr;
+    ts_first = nullptr;
+    ts_last = nullptr;
+
+    event_pool = nullptr;
+    event_ts_pool = nullptr;
+    allocated_ts_events = 0;
+
+    advance_callback = nullptr;
 }
 
 void Shutdown() {