(cherry picked from commit 6c9661a20ec1fbb2dcfc234bb02a29f607b2ccb7) Source commit: f80bd426ef39ae533beefbce3e75cf4ff75dbe2b
@@ -2228,7 +2228,11 @@ void GUIFinalize()
Thread = SystemRequiredThread;
SystemRequiredThread = NULL;
}
- Thread->Terminate();
- Thread->WaitFor();
- delete Thread;
+
+ if (Thread != NULL)
+ {
+ Thread->Terminate();
+ Thread->WaitFor();
+ delete Thread;
+ }