diff options
| author | Bastien Bouclet | 2020-01-01 08:19:48 +0100 |
|---|---|---|
| committer | Bastien Bouclet | 2020-01-01 08:19:48 +0100 |
| commit | 94543467822401b407f4b061268e42d59d6a905b (patch) | |
| tree | 09220358172e1e665c66d97e57c368381bab9261 /gui | |
| parent | 13e0ea0ad47e2863b6e1fa319042507b762621a3 (diff) | |
| download | scummvm-rg350-94543467822401b407f4b061268e42d59d6a905b.tar.gz scummvm-rg350-94543467822401b407f4b061268e42d59d6a905b.tar.bz2 scummvm-rg350-94543467822401b407f4b061268e42d59d6a905b.zip | |
ENGINES: Copy the data referenced by QualifiedGameDescriptor
The engineId, gameId and description come from static data in the game
engines. When the game engines are compiled as dynamic plugins, the QGD
structure may outlive the engine plugin. Making a copy ensures the data
remains available.
Fixes #11292.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/editgamedialog.cpp | 2 | ||||
| -rw-r--r-- | gui/launcher.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gui/editgamedialog.cpp b/gui/editgamedialog.cpp index c2953dc8e5..6c553f8783 100644 --- a/gui/editgamedialog.cpp +++ b/gui/editgamedialog.cpp @@ -121,7 +121,7 @@ EditGameDialog::EditGameDialog(const String &domain) // GAME: Determine the description string String description(ConfMan.get("description", domain)); - if (description.empty() && qgd.description) { + if (description.empty() && !qgd.description.empty()) { description = qgd.description; } diff --git a/gui/launcher.cpp b/gui/launcher.cpp index 94af6472a5..21937494c4 100644 --- a/gui/launcher.cpp +++ b/gui/launcher.cpp @@ -284,7 +284,7 @@ void LauncherDialog::updateListing() { if (description.empty()) { QualifiedGameDescriptor g = EngineMan.findTarget(iter->_key); - if (g.description) + if (!g.description.empty()) description = g.description; } |