summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2013-11-25 09:12:49 +0000
committerrubidium <rubidium@openttd.org>2013-11-25 09:12:49 +0000
commitee0aa389a8523a44475d192100b21b2f9b413082 (patch)
treed87367cb2f41aae0984193432f51c8eb1852d26a /src
parent0460b78515eb4e703e75559b1281008edaae7199 (diff)
downloadopenttd-ee0aa389a8523a44475d192100b21b2f9b413082.tar.xz
(svn r26097) -Fix: another minor memory leak (when pressing cancel in the bootstrap window)
Diffstat (limited to 'src')
-rw-r--r--src/openttd.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp
index c5d4600c9..4f099cfa1 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -799,7 +799,9 @@ int openttd_main(int argc, char *argv[])
#endif /* ENABLE_NETWORK */
if (!HandleBootstrap()) {
+ delete scanner;
ShutdownGame();
+
goto exit_bootstrap;
}
@@ -863,6 +865,7 @@ int openttd_main(int argc, char *argv[])
CheckForMissingGlyphs();
+ /* ScanNewGRFFiles now has control over the scanner. */
ScanNewGRFFiles(scanner);
_video_driver->MainLoop();