X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayout.c;h=c58b39bc5f39d4cea748947d75925b936c9028e2;hb=e0110aa587acfa5b011162ea86873675c2fc96d9;hp=dd7e75f0e3060f36c2d23ccc4a1be5b20668e38e;hpb=0056122343c782902457802bb1ef6bde7c14d3c9;p=src%2Fagl-compositor.git

diff --git a/src/layout.c b/src/layout.c
index dd7e75f..c58b39b 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -241,6 +241,11 @@ ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi)
 {
 	struct ivi_output *out;
 
+	if (!app_id) {
+		weston_log("ivi_layout_find_with_app_id() failed w/ no app_id\n");
+		return NULL;
+	}
+
 	wl_list_for_each(out, &ivi->outputs, link) {
 		if (!out->app_id)
 			continue;
@@ -824,6 +829,7 @@ ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
 
 				weston_layer_entry_remove(&view->layer_link);
 				weston_output_damage(ivi_output->output);
+				ivi_output->active = NULL;
 			}
 		} else {
 			struct weston_desktop_surface *dsurface;