loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when sorting after applying settings.

Browse Source 
It occurred because the settings weren't getting updated with the
determined game path, so LOOT was trying to scan an invalid path.

The settings now get updated correctly, though initialising a game
doesn't update the settings' path in the UI, unless LOOT is restarted.
This commit is contained in:
Oliver Hamlet
2014-12-14 17:47:48 +00:00
parent 376839f643
commit e61b9760d6
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/app.cpp
+10 -1
View File
@@ -242,6 +242,8 @@ namespace loot {
_currentGame = SelectGame(_settings, _games, cmdLineGame);
BOOST_LOG_TRIVIAL(debug) << "Initialising game-specific settings.";
_games[_currentGame].Init(true);
// Update game path in settings object.
_settings["games"] = _games;
}
catch (loot::error &e) {
if (e.code() == loot::error::no_game_detected) {
@@ -279,8 +281,8 @@ namespace loot {
newGameFolders.insert(game.FolderName());
}
// Remove deleted games. As the current game is stored using its index,
// Remove deleted games. As the current game is stored using its index,
// removing an earlier game may invalidate it.
for (auto it = _games.begin(); it != _games.end();) {
if (newGameFolders.find(it->FolderName()) == newGameFolders.end()) {
@@ -294,6 +296,11 @@ namespace loot {
else
++it;
}
// Re-initialise the current game in case the game path setting was changed.
_games[_currentGame].Init(true);
// Update game path in settings object.
_settings["games"] = _games;
}
void LootState::ChangeGame(const std::string& newGameFolder) {
@@ -305,6 +312,8 @@ namespace loot {
_currentGame = std::distance(_games.begin(), it);
_games[_currentGame].Init(true);
// Update game path in settings object.
_settings["games"] = _games;
BOOST_LOG_TRIVIAL(debug) << "New game is " << _games[_currentGame].Name();
}