diff --git a/VERSION b/VERSION
index 2a727309..b5caf011 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-B1-118-g7b11ab04c6+1
\ No newline at end of file
+B1-119-g6b2e78acdf+1
\ No newline at end of file
diff --git a/client/src/main.c b/client/src/main.c
index 254e18ce..1dafc819 100644
--- a/client/src/main.c
+++ b/client/src/main.c
@@ -369,6 +369,8 @@ static int frameThread(void * unused)
 
   SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH);
   lgWaitEvent(e_startup, TIMEOUT_INFINITE);
+  if (!state.running)
+    return 0;
 
   // subscribe to the frame queue
   while(state.running)
@@ -1504,7 +1506,10 @@ static void lg_shutdown()
   state.running = false;
 
   if (t_render)
+  {
+    lgSignalEvent(e_startup);
     lgJoinThread(t_render, NULL);
+  }
 
   lgmpClientFree(&state.lgmp);