mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-21 09:23:53 +00:00
Merge branch 'clear_lua_actions' into 'master'
Fix quickload causing a crash with certain Lua queued actions Closes #7801 See merge request OpenMW/openmw!3833
This commit is contained in:
commit
62f2f4a011
1 changed files with 2 additions and 1 deletions
|
@ -693,7 +693,8 @@ void MWState::StateManager::quickLoad()
|
||||||
{
|
{
|
||||||
if (currentCharacter->begin() == currentCharacter->end())
|
if (currentCharacter->begin() == currentCharacter->end())
|
||||||
return;
|
return;
|
||||||
loadGame(currentCharacter, currentCharacter->begin()->mPath); // Get newest save
|
// use requestLoad, otherwise we can crash by loading during the wrong part of the frame
|
||||||
|
requestLoad(currentCharacter->begin()->mPath);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue