1 files changed, 5 insertions, 2 deletions
diff --git a/backends/null/null.cpp b/backends/null/null.cpp
index 03939896b1..e4d7a7a2b1 100644
--- a/backends/null/null.cpp
+++ b/backends/null/null.cpp
@@ -107,10 +107,13 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 };
 
 int main(int argc, char *argv[]) {
-	// Invoke the actual ScummVM main entry point:
 	g_system = OSystem_NULL_create();
 	assert(g_system);
-	return scummvm_main(argc, argv);
+
+	// Invoke the actual ScummVM main entry point:
+	int res = scummvm_main(argc, argv);
+	g_system->quit();	// TODO: Consider removing / replacing this!
+	return res;
 }
 
 OSystem_NULL::OSystem_NULL()