diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:55:01 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:47:44 +0200 |
| commit | 102299630901d08a44ef3aec367fcbcae065b9fe (patch) | |
| tree | 98db4bbe0c54176c0a43e2f5076f8b3d63b8065c /gui/saveload-dialog.cpp | |
| parent | 583f9abaf98f64895546b75573e9442ca47426e3 (diff) | |
| parent | 78ba3210a57094086d44b25d5a8507c33ce9bef3 (diff) | |
| download | scummvm-rg350-102299630901d08a44ef3aec367fcbcae065b9fe.tar.gz scummvm-rg350-102299630901d08a44ef3aec367fcbcae065b9fe.tar.bz2 scummvm-rg350-102299630901d08a44ef3aec367fcbcae065b9fe.zip | |
Merge branch 'master'
Diffstat (limited to 'gui/saveload-dialog.cpp')
| -rw-r--r-- | gui/saveload-dialog.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gui/saveload-dialog.cpp b/gui/saveload-dialog.cpp index df8dda7470..c7dd62b6c6 100644 --- a/gui/saveload-dialog.cpp +++ b/gui/saveload-dialog.cpp @@ -35,6 +35,14 @@ namespace GUI { #ifndef DISABLE_SAVELOADCHOOSER_GRID SaveLoadChooserType getRequestedSaveLoadDialog(const MetaEngine &metaEngine) { const Common::String &userConfig = ConfMan.get("gui_saveload_chooser", Common::ConfigManager::kApplicationDomain); + + // Check (and update if necessary) the theme config here. This catches + // resolution changes, which happened after the GUI was closed. This + // should assure that the correct GUI width/height are returned below and + // prevent the logic from picking the grid dialog, even though it is not + // possible to use it. + g_gui.checkScreenChange(); + if (g_gui.getWidth() >= 640 && g_gui.getHeight() >= 400 && metaEngine.hasFeature(MetaEngine::kSavesSupportMetaInfo) && metaEngine.hasFeature(MetaEngine::kSavesSupportThumbnail) |