1 files changed, 8 insertions, 2 deletions
diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp
index 522f957..a7f435a 100644
--- a/homescreen/src/main.cpp
+++ b/homescreen/src/main.cpp
@@ -111,13 +111,19 @@ int main(int argc, char *argv[])
     });
 
     layoutHandler->set_event_handler(QLibWindowmanager::Event_Visible, [layoutHandler, launcher](json_object *object) {
-        QString label = QString(json_object_get_string(	json_object_object_get(object, "drawing_name") ));
+        json_object* value = nullptr;
+        json_object_object_get_ex(object, "drawing_name", &value);
+
+        QString label = QString(json_object_get_string(	value ));
         qDebug() << label;
         QMetaObject::invokeMethod(launcher, "setCurrent", Qt::QueuedConnection, Q_ARG(QString, label == "HomeScreen" ? "Home" : label));
     });
 
     layoutHandler->set_event_handler(QLibWindowmanager::Event_Invisible, [layoutHandler, launcher](json_object *object) {
-        const char* label = json_object_get_string(	json_object_object_get(object, "drawing_name") );
+        json_object* value = nullptr;
+        json_object_object_get_ex(object, "drawing_name", &value);
+
+        const char* label = json_object_get_string(	value );
         HMI_DEBUG("HomeScreen", "surface %s Event_Invisible", label);
     });