SDL: Split quit() method into deinit() so error codes could be returned.

svn-id: r49131

3 files changed, 8 insertions, 2 deletions

diff --git a/backends/platform/sdl/main.cpp b/backends/platform/sdl/main.cpp
index b38b815438..13e614a4a2 100644
--- a/backends/platform/sdl/main.cpp
+++ b/backends/platform/sdl/main.cpp
@@ -63,7 +63,7 @@ int main(int argc, char *argv[]) {
 
 	// Invoke the actual ScummVM main entry point:
 	int res = scummvm_main(argc, argv);
-	g_system->quit();	// TODO: Consider removing / replacing this!
+	((OSystem_SDL *)g_system)->deinit();
 	return res;
 }
 
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 33a06629f8..9fa43cb389 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -496,7 +496,7 @@ bool OSystem_SDL::getFeatureState(Feature f) {
 	}
 }
 
-void OSystem_SDL::quit() {
+void OSystem_SDL::deinit() {
 	if (_cdrom) {
 		SDL_CDStop(_cdrom);
 		SDL_CDClose(_cdrom);
@@ -525,6 +525,10 @@ void OSystem_SDL::quit() {
 	// recorded events
 	delete getEventManager();
 	delete _savefile;
+}
+
+void OSystem_SDL::quit() {
+	deinit();
 
 #if !defined(SAMSUNGTV)
 	exit(0);
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index b178d58994..c850ec5ab1 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -202,6 +202,8 @@ public:
 	// Quit
 	virtual void quit(); // overloaded by CE backend
 
+	void deinit();
+
 	virtual void getTimeAndDate(TimeDate &t) const;
 	virtual Common::TimerManager *getTimerManager();