mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 12:15:36 +00:00
Code Issues Releases Wiki Activity

issue-6667 pressing escape during wait causes black screen

Browse source
This commit is contained in:
Eris Caffee 2022-04-17 20:26:23 +00:00 committed by psi29a
parent a0d0f60490
commit 627656ace0
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

@ -107,6 +107,7 @@
Bug #6606: Quests with multiple IDs cannot always be restarted 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 #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 #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 #6670: Dialogue order is incorrect
Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer Bug #6680: object.cpp handles nodetree unsafely, memory access with dangling pointer
Bug #6682: HitOnMe doesn't fire as intended 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() 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() void WaitDialog::clear()
{ {
mSleeping = false; mSleeping = false;
mHours = 1;
mManualHours = 1;
mFadeTimeRemaining = 0;
mInterruptAt = -1;
mTimeAdvancer.stop(); mTimeAdvancer.stop();
} }