X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2Fwindowmanager.git;a=blobdiff_plain;f=src%2Fapp.cpp;h=67087060474acd1eeacf0871f038a3e32d725938;hp=59b762d39d9c5e750ab5b875dd6688a46f5adc4c;hb=3ec58ace778153427a161aca26192ba0279471bf;hpb=65542e2498c33d534a9ab8037c3e0f1b263a6077

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";