2 files changed, 5 insertions, 1 deletions
diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp
index efb8e9afc8..b9318fd327 100644
--- a/backends/graphics/sdl/sdl-graphics.cpp
+++ b/backends/graphics/sdl/sdl-graphics.cpp
@@ -190,6 +190,10 @@ SdlGraphicsManager::SdlGraphicsManager()
 }
 
 SdlGraphicsManager::~SdlGraphicsManager() {
+	// Unregister the event observer
+	if (g_system->getEventManager()->getEventDispatcher() != NULL)
+		g_system->getEventManager()->getEventDispatcher()->unregisterObserver(this);
+
 	unloadGFXMode();
 	g_system->deleteMutex(_graphicsMutex);
 
diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h
index 157c754a5f..a990d31a0f 100644
--- a/backends/graphics/sdl/sdl-graphics.h
+++ b/backends/graphics/sdl/sdl-graphics.h
@@ -73,7 +73,7 @@ public:
 /**
  * SDL graphics manager
  */
-class SdlGraphicsManager : public GraphicsManager, public Common::EventObserver  {
+class SdlGraphicsManager : public GraphicsManager, public Common::EventObserver {
 public:
 	SdlGraphicsManager();
 	virtual ~SdlGraphicsManager();