aboutsummaryrefslogtreecommitdiff
path: root/backends/sdl
diff options
context:
space:
mode:
authorMax Horn2006-04-02 14:31:23 +0000
committerMax Horn2006-04-02 14:31:23 +0000
commite9bc5ba280d4b893feb8b704423a9a757f0141bf (patch)
tree6589f8623fa517f2c9223f29cfa72b61eea2e6d8 /backends/sdl
parent9217472f0e4e801659c0a448dcbf57c28fd36ee2 (diff)
downloadscummvm-rg350-e9bc5ba280d4b893feb8b704423a9a757f0141bf.tar.gz
scummvm-rg350-e9bc5ba280d4b893feb8b704423a9a757f0141bf.tar.bz2
scummvm-rg350-e9bc5ba280d4b893feb8b704423a9a757f0141bf.zip
Backends now are also responsile for deiniting properly. In particular, moved the call to quit() from scummvm_main to the various backend main routines (porters may want to replace it by something different)
svn-id: r21559
Diffstat (limited to 'backends/sdl')
-rw-r--r--backends/sdl/sdl.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index 2d567ea769..ed3371d4fb 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/sdl/sdl.cpp
@@ -91,12 +91,14 @@ int main(int argc, char *argv[]) {
#endif // defined(__SYMBIAN32__)
-
+ // Create our OSystem instance
g_system = new OSystem_SDL();
assert(g_system);
// Invoke the actual ScummVM main entry point:
- return scummvm_main(argc, argv);
+ int res = scummvm_main(argc, argv);
+ g_system->quit(); // TODO: Consider removing / replacing this!
+ return res;
}
#endif