Skip to content

Commit 675146b

Browse files
committed
Merge branch 'sellmesweetlittlecrashes' into 'master'
Clear the window manager before destroying singletons Closes #8576 See merge request OpenMW/openmw!4727
2 parents eca9b84 + cbb50c0 commit 675146b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@
237237
Bug #8503: Camera does not handle NaN gracefully
238238
Bug #8541: Lua: util.color:asHex produces wrong output for some colors
239239
Bug #8567: Token replacement does not work via CLI and relative paths passed via the command line are not relative to the CWD
240+
Bug #8576: Crash on exit when unresolving containers with scripted items
240241
Feature #1415: Infinite fall failsafe
241242
Feature #2566: Handle NAM9 records for manual cell references
242243
Feature #3501: OpenMW-CS: Instance Editing - Shortcuts for axial locking

apps/openmw/engine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,8 +404,8 @@ OMW::Engine::~Engine()
404404
mMechanicsManager = nullptr;
405405
mDialogueManager = nullptr;
406406
mJournal = nullptr;
407-
mScriptManager = nullptr;
408407
mWindowManager = nullptr;
408+
mScriptManager = nullptr;
409409
mWorld = nullptr;
410410
mStereoManager = nullptr;
411411
mSoundManager = nullptr;

0 commit comments

Comments
 (0)