X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Femul%2Femul.cpp;h=7e1da2ed9a8d2b01b3691ccf61a64d243b0552cc;hb=a44c75542e3457749e084a2eb860b668af8d1d72;hp=9b06fb90269236d1a34a07164ce9b9af2b47291a;hpb=049904b385eb53310e0d7fc0e681edf65b0d632d;p=bertos.git

diff --git a/bertos/emul/emul.cpp b/bertos/emul/emul.cpp
index 9b06fb90..7e1da2ed 100644
--- a/bertos/emul/emul.cpp
+++ b/bertos/emul/emul.cpp
@@ -39,8 +39,6 @@
 #include "emul.h"
 #include "emulwin.h"
 
-#include "cfg/cfg_kern.h"
-
 #include <cfg/module.h>
 
 #include <QtGui/qapplication.h>
@@ -91,6 +89,10 @@ extern "C" void emul_cleanup()
 {
 	MOD_CLEANUP(emul);
 
+	// Timer must be made inactive before we destroy the emulator
+	extern bool timer_initialized;
+	ASSERT(!timer_initialized);
+
 	delete emul;
 	emul = NULL;
 }
@@ -99,6 +101,5 @@ extern "C" void emul_idle()
 {
 	// We process GUI events when the application is idle.
 	emul->emulApp->processEvents();
-	usleep(1000);
 }