WinRT: fixed bug whereby attempting to create a 2nd window (which intentionall fails, for now) would cause mouse input to stop working

This commit is contained in:
David Ludwig 2012-10-29 23:32:13 -04:00
parent 63cedf50fe
commit eb801fe007
3 changed files with 9 additions and 2 deletions

View File

@ -198,6 +198,11 @@ SDL_DisplayMode SDL_WinRTApp::GetMainDisplayMode()
return mode;
}
const SDL_WindowData * SDL_WinRTApp::GetSDLWindowData() const
{
return m_sdlWindowData;
}
bool SDL_WinRTApp::HasSDLWindowData() const
{
return (m_sdlWindowData != NULL);

View File

@ -23,8 +23,9 @@ internal:
// SDL-specific methods
SDL_DisplayMode GetMainDisplayMode();
void PumpEvents();
const SDL_WindowData * GetSDLWindowData() const;
bool HasSDLWindowData() const;
void SetSDLWindowData(const SDL_WindowData* windowData);
void SetSDLWindowData(const SDL_WindowData * windowData);
protected:
// Event Handlers.

View File

@ -168,7 +168,8 @@ WINRT_CreateWindow(_THIS, SDL_Window * window)
void
WINRT_DestroyWindow(_THIS, SDL_Window * window)
{
if (SDL_WinRTGlobalApp->HasSDLWindowData())
if (SDL_WinRTGlobalApp->HasSDLWindowData() &&
SDL_WinRTGlobalApp->GetSDLWindowData()->sdlWindow == window)
{
SDL_WinRTGlobalApp->SetSDLWindowData(NULL);
}