From 5e3093dfd69b74dea9aef46a5d3384485cfd9131 Mon Sep 17 00:00:00 2001 From: David Ludwig Date: Tue, 12 Feb 2013 12:57:06 -0500 Subject: [PATCH] WinRT: fixed bug: SDL_CreateWindow wouldn't work after an initial window was created + destroyed --- src/video/windowsrt/SDL_winrtvideo.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/video/windowsrt/SDL_winrtvideo.cpp b/src/video/windowsrt/SDL_winrtvideo.cpp index 682ea386e..1d56e0c72 100644 --- a/src/video/windowsrt/SDL_winrtvideo.cpp +++ b/src/video/windowsrt/SDL_winrtvideo.cpp @@ -222,6 +222,12 @@ WINRT_DestroyWindow(_THIS, SDL_Window * window) { SDL_WindowData * data = (SDL_WindowData *) window->driverdata; + if (SDL_WinRTGlobalApp->HasSDLWindowData() && + SDL_WinRTGlobalApp->GetSDLWindowData()->sdlWindow == window) + { + SDL_WinRTGlobalApp->SetSDLWindowData(NULL); + } + if (data) { // Delete the reference to the WinRT CoreWindow: CoreWindow ^* windowPointer = ((SDL_WindowData *) window->driverdata)->coreWindow; @@ -234,12 +240,6 @@ WINRT_DestroyWindow(_THIS, SDL_Window * window) delete data; data = NULL; } - - if (SDL_WinRTGlobalApp->HasSDLWindowData() && - SDL_WinRTGlobalApp->GetSDLWindowData()->sdlWindow == window) - { - SDL_WinRTGlobalApp->SetSDLWindowData(NULL); - } } SDL_bool