From: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Date: Tue, 12 Sep 2017 09:29:35 +0000 (+0200)
Subject: App: be more thorough when checking surface-associated LayoutState
X-Git-Tag: 4.99.1~95
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2Fwindowmanager.git;a=commitdiff_plain;h=3ec58ace778153427a161aca26192ba0279471bf

App: be more thorough when checking surface-associated LayoutState

Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
---

diff --git a/src/app.cpp b/src/app.cpp
index 59b762d..6708706 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -493,7 +493,13 @@ char const *App::deactivate_surface(char const *drawing_name) {
       return "Cannot deactivate main_surface";
    }
 
-   struct LayoutState &state = **this->layers.get_layout_state(*surface_id);
+   auto o_state = *this->layers.get_layout_state(*surface_id);
+
+   if (! o_state) {
+      return "Could not find layer for surface";
+   }
+
+   struct LayoutState &state = *o_state;
 
    if (state.main == -1) {
       return "No surface active";