diff --git a/CHANGELOG.md b/CHANGELOG.md index 18b0b99fc..2bb06874b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Bug #4540: Rain delay when exiting water Bug #4701: PrisonMarker record is not hardcoded like other markers Bug #4714: Crash upon game load in the repair menu while the "Your repair failed!" message is active + Bug #4715: "Cannot get class of an empty object" exception after pressing ESC in the dialogue mode Feature #2229: Improve pathfinding AI Feature #3442: Default values for fallbacks from ini file Feature #4673: Weapon sheathing diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 3ac8839e2..dfb2b15b9 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -740,6 +740,9 @@ namespace MWGui bool DialogueWindow::isCompanion(const MWWorld::Ptr& actor) { + if (actor.isEmpty()) + return false; + return !actor.getClass().getScript(actor).empty() && actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion"); }