X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fapp.cpp;h=47fb85cfae82b5231fb0aceced6377b280ac74b2;hb=8702bacd3035f9c9c7fb64b7938cafd4b7a24fd6;hp=67087060474acd1eeacf0871f038a3e32d725938;hpb=3ec58ace778153427a161aca26192ba0279471bf;p=staging%2Fwindowmanager.git

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) {