aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-07-18 20:02:27 +0000
committerMax Horn2004-07-18 20:02:27 +0000
commitadc9313f89c7130ea9ad310219d280d1ee5382f7 (patch)
treee5022d7eb08e0a82b0573b25ef416fca1806b1d2
parente02e6408f25b1d683b06cef1d83b389a8d43aa89 (diff)
downloadscummvm-rg350-adc9313f89c7130ea9ad310219d280d1ee5382f7.tar.gz
scummvm-rg350-adc9313f89c7130ea9ad310219d280d1ee5382f7.tar.bz2
scummvm-rg350-adc9313f89c7130ea9ad310219d280d1ee5382f7.zip
Move g_timer destruction to proper place
svn-id: r14262
-rw-r--r--base/engine.cpp1
-rw-r--r--base/main.cpp1
2 files changed, 1 insertions, 1 deletions
diff --git a/base/engine.cpp b/base/engine.cpp
index dce6d07f8a..da98ea7bb7 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -53,7 +53,6 @@ Engine::~Engine() {
File::resetDefaultDirectories();
delete _mixer;
- delete _timer;
delete _saveFileMan;
}
diff --git a/base/main.cpp b/base/main.cpp
index 1d63578c63..6e461eb842 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -377,6 +377,7 @@ extern "C" int scummvm_main(GameDetector &detector, int argc, char *argv[]) {
//}
// ...and quit (the return 0 should never be reached)
+ delete g_timer;
system->quit();
delete system;
return 0;