4 files changed, 8 insertions, 9 deletions
diff --git a/backends/platform/sdl/graphics.cpp b/backends/platform/sdl/graphics.cpp
index a97a153f3c..aec90d1352 100644
--- a/backends/platform/sdl/graphics.cpp
+++ b/backends/platform/sdl/graphics.cpp
@@ -1693,6 +1693,7 @@ void OSystem_SDL::drawMouse() {
 
 	SDL_Rect dst;
 	int scale;
+	int width, height;
 	int hotX, hotY;
 
 	dst.x = _mouseCurState.x;
@@ -1700,12 +1701,16 @@ void OSystem_SDL::drawMouse() {
 
 	if (!_overlayVisible) {
 		scale = _videoMode.scaleFactor;
+		width = _videoMode.screenWidth;
+		height = _videoMode.screenHeight;
 		dst.w = _mouseCurState.vW;
 		dst.h = _mouseCurState.vH;
 		hotX = _mouseCurState.vHotX;
 		hotY = _mouseCurState.vHotY;
 	} else {
 		scale = 1;
+		width = _videoMode.overlayWidth;
+		height = _videoMode.overlayHeight;
 		dst.w = _mouseCurState.rW;
 		dst.h = _mouseCurState.rH;
 		hotX = _mouseCurState.rHotX;
diff --git a/backends/platform/sdl/main.cpp b/backends/platform/sdl/main.cpp
index 52bbb59165..ef95a6d256 100644
--- a/backends/platform/sdl/main.cpp
+++ b/backends/platform/sdl/main.cpp
@@ -64,7 +64,7 @@ int main(int argc, char *argv[]) {
 
 	// Invoke the actual ScummVM main entry point:
 	int res = scummvm_main(argc, argv);
-	((OSystem_SDL *)g_system)->deinit();
+	g_system->quit();	// TODO: Consider removing / replacing this!
 	return res;
 }
 
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 6686249416..5c50a43daf 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -483,7 +483,7 @@ bool OSystem_SDL::getFeatureState(Feature f) {
 	}
 }
 
-void OSystem_SDL::deinit() {
+void OSystem_SDL::quit() {
 	if (_cdrom) {
 		SDL_CDStop(_cdrom);
 		SDL_CDClose(_cdrom);
@@ -505,14 +505,10 @@ void OSystem_SDL::deinit() {
 
 	SDL_Quit();
 
-	// Event Manager requires save manager for storing
+	// Even Manager requires save manager for storing
 	// 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 5c901ba711..ace07f349e 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -202,8 +202,6 @@ public:
 	// Quit
 	virtual void quit(); // overloaded by CE backend
 
-	void deinit();
-
 	virtual void getTimeAndDate(TimeDate &t) const;
 	virtual Common::TimerManager *getTimerManager();