From: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Date: Tue, 12 Sep 2017 09:29:35 +0000 (+0200)
Subject: App: thoroughly check LayoutState availability in activate too
X-Git-Tag: 4.99.1~94
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2Fwindowmanager.git;a=commitdiff_plain;h=8702bacd3035f9c9c7fb64b7938cafd4b7a24fd6

App: thoroughly check LayoutState availability in activate too

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

diff --git a/src/app.cpp b/src/app.cpp
index 6708706..47fb85c 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -392,7 +392,13 @@ char const *App::activate_surface(char const *drawing_name) {
       return "Surface is not on any layer!";
    }
 
-   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;
 
    // disable layers that are above our current layer
    for (auto const &l : this->layers.mapping) {