PINK: fixed finding of nullptr Actor

scummvm · Jun 28, 2018 · d11115a · d11115a
1 parent ab4980a
commit d11115a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp
@@ -39,10 +39,15 @@ void Page::load(Archive &archive) {
 }
 
 Actor *Page::findActor(const Common::String &name) {
-    return *Common::find_if(_actors.begin(), _actors.end(), [&name]
+    auto it = Common::find_if(_actors.begin(), _actors.end(), [&name]
             (Actor *actor) {
         return name == actor->getName();
-    });;
+    });
+
+    if (it == _actors.end())
+        return nullptr;
+
+    return *it;
 }
 
 Sound *Page::loadSound(Common::String &fileName) {