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
grpc-proxy/main-grpc: Don't fall trough assuming we have a wl_display
[src/agl-compositor.git]
/
grpc-proxy
/
main-grpc.cpp
diff --git
a/grpc-proxy/main-grpc.cpp
b/grpc-proxy/main-grpc.cpp
index
a8c1c5e
..
5569fc8
100644
(file)
--- a/
grpc-proxy/main-grpc.cpp
+++ b/
grpc-proxy/main-grpc.cpp
@@
-387,7
+387,8
@@
__register_shell_init(void)
wl_display = wl_display_connect(NULL);
if (!wl_display) {
wl_display = wl_display_connect(NULL);
if (!wl_display) {
- goto err;
+ ret = -1;
+ goto err_failed_display;
}
registry = wl_display_get_registry(wl_display);
sh->wait_for_bound = true;
}
registry = wl_display_get_registry(wl_display);
sh->wait_for_bound = true;
@@
-416,6
+417,8
@@
__register_shell_init(void)
err:
wl_registry_destroy(registry);
wl_display_disconnect(wl_display);
err:
wl_registry_destroy(registry);
wl_display_disconnect(wl_display);
+
+err_failed_display:
delete sh;
return ret;
}
delete sh;
return ret;
}