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:
@@ -872,6 +872,11 @@ const char *VideoDriver_SDL_Base::Start(const StringList ¶m)
|
||||
const char *dname = SDL_GetCurrentVideoDriver();
|
||||
DEBUG(driver, 1, "SDL2: using driver '%s'", dname);
|
||||
|
||||
this->driver_info = this->GetName();
|
||||
this->driver_info += " (";
|
||||
this->driver_info += dname;
|
||||
this->driver_info += ")";
|
||||
|
||||
MarkWholeScreenDirty();
|
||||
|
||||
SDL_StopTextInput();
|
||||
|
||||
Reference in New Issue
Block a user