X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=99512d5412d0e5cf92b2745403e640737807e387;hb=168261297ce8d6e17ca69eb1de4d0e98de52eedc;hp=590742aa4388bd63858a1b0b2b16b0b75f59ccc3;hpb=a04518d86f8b048902bae0167c6a6bc9f2276e89;p=src%2Fagl-compositor.git

diff --git a/src/main.c b/src/main.c
index 590742a..99512d5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -102,6 +102,9 @@ ivi_output_configure_app_id(struct ivi_output *ivi_output)
 						 &ivi_output->app_id,
 						 NULL);
 
+		if (ivi_output->app_id == NULL)
+			return;
+
 		weston_log("Will place app_id %s on output %s\n",
 				ivi_output->app_id, ivi_output->name);
 	}
@@ -1476,11 +1479,11 @@ int main(int argc, char *argv[])
 
 	weston_compositor_flush_heads_changed(ivi.compositor);
 
-	ivi_shell_init_black_fs(&ivi);
-
 	if (ivi.remoting_api)
 		ivi_enable_remote_outputs(&ivi);
 
+	ivi_shell_init_black_fs(&ivi);
+
 	if (create_listening_socket(display, socket_name) < 0)
 		goto error_compositor;