pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed crash with multiple windows

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401973
This commit is contained in:
Sam Lantinga 2006-07-23 00:19:12 +00:00
parent e06b514882
commit 1d8a5a2349
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/video/SDL_renderer_gl.c
View file

@ -199,8 +199,7 @@ GL_CreateRenderer(SDL_Window * window, Uint32 flags)
GL_RenderData *data; GL_RenderData *data;
if (!(window->flags & SDL_WINDOW_OPENGL)) { if (!(window->flags & SDL_WINDOW_OPENGL)) {
window->flags |= SDL_WINDOW_OPENGL; if (SDL_RecreateWindow(window, window->flags | SDL_WINDOW_OPENGL) < 0) {
if (SDL_RecreateWindow(window) < 0) {
return NULL; return NULL;
} }
} }

2
src/video/SDL_sysvideo.h
View file

@ -397,7 +397,7 @@ extern SDL_bool SDL_AddDisplayMode(int displayIndex,
extern void SDL_AddRenderDriver(int displayIndex, extern void SDL_AddRenderDriver(int displayIndex,
const SDL_RenderDriver * driver); const SDL_RenderDriver * driver);
extern int SDL_RecreateWindow(SDL_Window * window); extern int SDL_RecreateWindow(SDL_Window * window, Uint32 flags);
extern SDL_Window *SDL_GetWindowFromID(SDL_WindowID windowID); extern SDL_Window *SDL_GetWindowFromID(SDL_WindowID windowID);
extern SDL_VideoDisplay *SDL_GetDisplayFromWindow(SDL_Window * window); extern SDL_VideoDisplay *SDL_GetDisplayFromWindow(SDL_Window * window);

6
src/video/SDL_video.c
View file

@ -843,16 +843,16 @@ SDL_CreateWindowFrom(const void *data)
} }
int int
SDL_RecreateWindow(SDL_Window * window) SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
{ {
if ((window->flags & SDL_WINDOW_OPENGL) && !_this->GL_CreateContext) { if ((flags & SDL_WINDOW_OPENGL) && !_this->GL_CreateContext) {
window->flags &= ~SDL_WINDOW_OPENGL;
SDL_SetError("No OpenGL support in video driver"); SDL_SetError("No OpenGL support in video driver");
return -1; return -1;
} }
if (_this->DestroyWindow) { if (_this->DestroyWindow) {
_this->DestroyWindow(_this, window); _this->DestroyWindow(_this, window);
} }
window->flags = flags;
return _this->CreateWindow(_this, window); return _this->CreateWindow(_this, window);
} }