Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/ci-build.yml # .github/workflows/commit-checker.yml # src/command.cpp # src/company_cmd.cpp # src/company_gui.cpp # src/crashlog.cpp # src/economy.cpp # src/lang/english.txt # src/lang/german.txt # src/lang/korean.txt # src/misc_gui.cpp # src/newgrf_config.cpp # src/openttd.cpp # src/settings_gui.cpp # src/ship_cmd.cpp # src/table/settings/gui_settings.ini
This commit is contained in:
@@ -1322,6 +1322,11 @@ const char *VideoDriver_Win32OpenGL::Start(const StringList ¶m)
|
||||
return err;
|
||||
}
|
||||
|
||||
this->driver_info = GetName();
|
||||
this->driver_info += " (";
|
||||
this->driver_info += OpenGLBackend::Get()->GetDriverName();
|
||||
this->driver_info += ")";
|
||||
|
||||
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) {
|
||||
|
||||
Reference in New Issue
Block a user