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
layout: Do not attempt to activate surfaces that doesn't have a valid app_id
[src/agl-compositor.git]
/
src
/
layout.c
diff --git
a/src/layout.c
b/src/layout.c
index
1895a07
..
0363af7
100644
(file)
--- a/
src/layout.c
+++ b/
src/layout.c
@@
-241,6
+241,9
@@
ivi_layout_find_with_app_id(const char *app_id, struct ivi_compositor *ivi)
{
struct ivi_output *out;
{
struct ivi_output *out;
+ if (!app_id)
+ return NULL;
+
wl_list_for_each(out, &ivi->outputs, link) {
if (!out->app_id)
continue;
wl_list_for_each(out, &ivi->outputs, link) {
if (!out->app_id)
continue;
@@
-742,6
+745,9
@@
ivi_layout_activate(struct ivi_output *output, const char *app_id)
struct ivi_surface *surf;
struct ivi_compositor *ivi = output->ivi;
struct ivi_surface *surf;
struct ivi_compositor *ivi = output->ivi;
+ if (!app_id)
+ return;
+
surf = ivi_find_app(ivi, app_id);
if (!surf)
return;
surf = ivi_find_app(ivi, app_id);
if (!surf)
return;
@@
-795,6
+801,9
@@
ivi_layout_deactivate(struct ivi_compositor *ivi, const char *app_id)
struct ivi_output *ivi_output;
struct ivi_policy *policy = ivi->policy;
struct ivi_output *ivi_output;
struct ivi_policy *policy = ivi->policy;
+ if (!app_id)
+ return;
+
surf = ivi_find_app(ivi, app_id);
if (!surf)
return;
surf = ivi_find_app(ivi, app_id);
if (!surf)
return;