X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=51578300d0bedc6e96eac6cd990d51625c5bbcf4;hb=675456391e4f74559661206ec919cb5f6cb46f69;hp=f5dc3e3458e022733b20ca61a23b572e221a4948;hpb=bdc551314dc5511be31550b8c2e06641b9a94639;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index f5dc3e3..5157830 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1622,9 +1622,8 @@ shell_set_app_output(struct wl_client *client, struct wl_resource *res,
 	struct weston_output *woutput = weston_head_get_output(head);
 	struct ivi_output *ioutput = to_ivi_output(woutput);
 	struct ivi_surface *surf = ivi_find_app(ivi, app_id);
-	struct ivi_output *desktop_last_output = surf->desktop.last_output;
-	struct ivi_output *current_completed_output =
-		surf->current_completed_output;
+	struct ivi_output *desktop_last_output;
+	struct ivi_output *current_completed_output;
 
 	if (!app_id || !ioutput)
 		return;
@@ -1636,6 +1635,9 @@ shell_set_app_output(struct wl_client *client, struct wl_resource *res,
 		return;
 	}
 
+	desktop_last_output = surf->desktop.last_output;
+	current_completed_output = surf->current_completed_output;
+
 	if (surf->remote.output)
 		surf->hidden_layer_output = surf->remote.output;
 	else