Shutdown lua before cleaning up rocket contexts

Otherwise Lua will try to use already cleaned up resources.
Unvanquished · Nov 2, 2015 · 79fc559 · 79fc559
1 parent 8012e3e
commit 79fc559
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/cgame/rocket/rocket.cpp b/src/cgame/rocket/rocket.cpp
@@ -395,6 +395,9 @@ void Rocket_Shutdown()
 	extern std::map<std::string, RocketDataGrid*> dataSourceMap;
 	extern std::queue< RocketEvent_t* > eventQueue;
 
+	// Shut down Lua before we clean up contexts
+	Rocket::Core::Lua::Interpreter::Shutdown();
+
 	if ( menuContext )
 	{
 		menuContext->RemoveReference();
@@ -407,7 +410,6 @@ void Rocket_Shutdown()
 		hudContext = nullptr;
 	}
 
-	Rocket::Core::Lua::Interpreter::Shutdown();
 	Rocket::Core::Shutdown();
 
 	// Prevent memory leaks