Commit b7aa856c8f342ad439dd9e955c4035b9e7a1a194
2015-06-22T23:36:06
Fixed bug 3030 - SDL_RecreateWindow fails to restore title, icon, etc. Adam M. It loses the title and icon when window recreation fails. For instance, this may happen when trying to create an OpenGL ES window on a system that doesn't support it. But at that point, the title and icon have already been lost.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 22e08cc..f464f07 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -1388,8 +1388,6 @@ SDL_CreateWindowFrom(const void *data)
int
SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
{
- char *title = window->title;
- SDL_Surface *icon = window->icon;
SDL_bool loaded_opengl = SDL_FALSE;
if ((flags & SDL_WINDOW_OPENGL) && !_this->GL_CreateContext) {
@@ -1429,8 +1427,6 @@ SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
}
}
- window->title = NULL;
- window->icon = NULL;
window->flags = ((flags & CREATE_FLAGS) | SDL_WINDOW_HIDDEN);
window->last_fullscreen_flags = window->flags;
window->is_destroying = SDL_FALSE;
@@ -1444,17 +1440,17 @@ SDL_RecreateWindow(SDL_Window * window, Uint32 flags)
return -1;
}
}
+
if (flags & SDL_WINDOW_FOREIGN) {
window->flags |= SDL_WINDOW_FOREIGN;
}
- if (title) {
- SDL_SetWindowTitle(window, title);
- SDL_free(title);
+ if (_this->SetWindowTitle && window->title) {
+ _this->SetWindowTitle(_this, window);
}
- if (icon) {
- SDL_SetWindowIcon(window, icon);
- SDL_FreeSurface(icon);
+
+ if (_this->SetWindowIcon && window->icon) {
+ _this->SetWindowIcon(_this, window, window->icon);
}
if (window->hit_test) {