Code Review
/
src
/
agl-compositor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
src: Mark surfaces with the 'remote' role if configuration file says so
[src/agl-compositor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
590742a
..
99512d5
100644
(file)
--- 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);
&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);
}
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);
weston_compositor_flush_heads_changed(ivi.compositor);
- ivi_shell_init_black_fs(&ivi);
-
if (ivi.remoting_api)
ivi_enable_remote_outputs(&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;
if (create_listening_socket(display, socket_name) < 0)
goto error_compositor;