Merged default into minor

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2015-01-22 02:18:56 -04:00
11 changed files with 418 additions and 6 deletions
+9 -3
View File
@@ -52,12 +52,18 @@ Window::Window()
Window::~Window()
{
if (context)
{
graphics::Graphics *gfx = Module::getInstance<graphics::Graphics>(Module::M_GRAPHICS);
if (gfx != nullptr)
gfx->unSetMode();
SDL_GL_DeleteContext(context);
}
if (window)
SDL_DestroyWindow(window);
if (context)
SDL_GL_DeleteContext(context);
SDL_QuitSubSystem(SDL_INIT_VIDEO);
}