mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Check for a validly mapped OpenGL screen buffer during driver init. (#9007)

pull/9021/head
Michael Lutz 2021-04-11 14:28:29 +02:00 committed by GitHub
parent d50b934bb4
commit 5644c00482
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video/sdl2_opengl_v.cpp
View File

@ -69,6 +69,11 @@ const char *VideoDriver_SDL_OpenGL::Start(const StringList &param)
int w, h; int w, h;
SDL_GetWindowSize(this->sdl_window, &w, &h); SDL_GetWindowSize(this->sdl_window, &w, &h);
this->ClientSizeChanged(w, h, true); this->ClientSizeChanged(w, h, true);
/* We should have a valid screen buffer now. If not, something went wrong and we should abort. */
if (_screen.dst_ptr == nullptr) {
this->Stop();
return "Can't get pointer to screen buffer";
}
return nullptr; return nullptr;
} }

6
src/video/win32_v.cpp
View File

@ -1305,6 +1305,12 @@ const char *VideoDriver_Win32OpenGL::Start(const StringList &param)
} }
this->ClientSizeChanged(this->width, this->height, true); this->ClientSizeChanged(this->width, this->height, true);
/* We should have a valid screen buffer now. If not, something went wrong and we should abort. */
if (_screen.dst_ptr == nullptr) {
this->Stop();
_cur_resolution = old_res;
return "Can't get pointer to screen buffer";
}
MarkWholeScreenDirty(); MarkWholeScreenDirty();