Created a static WindowManager::shutdown() fxn

tilesdl.cc now calls this after GLStateManager::shutdown() so
that it is not responsible for managing the wm pointer.

Signed-off-by: Enne Walker <enne.walker@gmail.com>

1 files changed, 11 insertions, 7 deletions

diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc
index 4d2caa3db8..54d45d65fe 100644
--- a/crawl-ref/source/windowmanager-sdl.cc
+++ b/crawl-ref/source/windowmanager-sdl.cc
@@ -24,6 +24,12 @@ void WindowManager::create()
     wm = new SDLWrapper();
 }
 
+void WindowManager::shutdown()
+{
+    delete wm;
+    wm = NULL;
+}
+
 static unsigned char _get_modifiers(SDL_keysym &keysym)
 {
     // keysym.mod can't be used to keep track of the modifier state.
@@ -223,6 +229,11 @@ SDLWrapper::SDLWrapper():
 {
 }
 
+SDLWrapper::~SDLWrapper()
+{
+    SDL_Quit();
+}
+
 int SDLWrapper::init(coord_def *m_windowsz)
 {
     // Do SDL initialization
@@ -699,13 +710,6 @@ bool SDLWrapper::load_texture(GenericTexture *tex, const char *filename,
     return (success);
 }
 
-void SDLWrapper::shutdown()
-{
-    SDL_Quit();
-    m_context = NULL;
-    video_info = NULL;
-}
-
 int SDLWrapper::byte_order()
 {
     if (SDL_BYTEORDER == SDL_BIG_ENDIAN)