From d11115a6aabb36043220b7c5e26e2b8f3a83660b Mon Sep 17 00:00:00 2001
From: whiterandrek
Date: Sun, 13 May 2018 13:08:56 +0300
Subject: PINK: fixed finding of nullptr Actor

---
 engines/pink/objects/pages/page.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'engines/pink/objects/pages/page.cpp')

diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp
index 1c0c67e85a..33ccf15357 100644
--- 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) {
-- 
cgit v1.2.3