1 files changed, 6 insertions, 9 deletions

diff --git a/uisimulator/sdl/uisdl.c b/uisimulator/sdl/uisdl.c
index 052fd4af83..37a0e6fe7a 100644
--- a/uisimulator/sdl/uisdl.c
+++ b/uisimulator/sdl/uisdl.c
@@ -41,6 +41,8 @@
 extern void                 app_main (void *); /* mod entry point */
 extern void                 new_key(int key);
 extern void                 sim_tick_tasks(void);
+extern void sim_io_init(void);
+extern void sim_io_shutdown(void);
 
 void button_event(int key, bool pressed);
 
@@ -167,16 +169,9 @@ bool gui_startup(void)
 
 bool gui_shutdown(void)
 {
-    int i;
-
-    SDL_KillThread(gui_thread);
     SDL_RemoveTimer(tick_timer_id);
-
-    for (i = 0; i < threadCount; i++)
-    {
-        SDL_KillThread(threads[i]);
-    }
-
+    kill_sim_threads();
+    sim_io_shutdown();
     return true;
 }
 
@@ -236,6 +231,8 @@ int main(int argc, char *argv[])
         background = false;
     }
 
+    sim_io_init();
+
     if (!gui_startup())
         return -1;