mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-17 19:20:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'issue-6667-pressing_escape_during_wait_causes_black_screen' into 'master'

Browse Source 
issue-6667 pressing escape during wait causes black screen

See merge request OpenMW/openmw!1783
This commit is contained in:
psi29a 2022-04-17 20:26:23 +00:00
commit 4e723cad59
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -108,6 +108,7 @@
Bug #6606: Quests with multiple IDs cannot always be restarted
Bug #6653: With default settings the in-game console doesn't fit into screen
Bug #6655: Constant effect absorb attribute causes the game to break
Bug #6667: Pressing the Esc key while resting or waiting causes black screen.
Bug #6670: Dialogue order is incorrect
Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
Bug #6682: HitOnMe doesn't fire as intended

12
apps/openmw/mwgui/waitdialog.cpp
View File

@ -98,12 +98,22 @@ namespace MWGui
bool WaitDialog::exit()
{
return (!mTimeAdvancer.isRunning()); //Only exit if not currently waiting
bool canExit = !mTimeAdvancer.isRunning(); // Only exit if not currently waiting
if (canExit)
{
clear();
stopWaiting();
}
return canExit;
}
void WaitDialog::clear()
{
mSleeping = false;
mHours = 1;
mManualHours = 1;
mFadeTimeRemaining = 0;
mInterruptAt = -1;
mTimeAdvancer.stop();
}