X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=grpc-proxy%2Fmain-grpc.cpp;h=5b07d647d6e8cdf4daf2613f35783de0f10bcaca;hb=refs%2Fchanges%2F01%2F29301%2F1;hp=1e297c535645d95ea81a9df2f1579063ef717456;hpb=4a1684308bd6a17c5b112d30e672c40fd348fef3;p=src%2Fagl-compositor.git diff --git a/grpc-proxy/main-grpc.cpp b/grpc-proxy/main-grpc.cpp index 1e297c5..5b07d64 100644 --- a/grpc-proxy/main-grpc.cpp +++ b/grpc-proxy/main-grpc.cpp @@ -275,7 +275,7 @@ global_add(void *data, struct wl_registry *reg, uint32_t id, sh->shell = static_cast(wl_registry_bind(reg, id, &agl_shell_interface, - std::min(static_cast(8), version))); + std::min(static_cast(10), version))); agl_shell_add_listener(sh->shell, &shell_listener, data); sh->version = version; } else if (strcmp(interface, "wl_output") == 0) { @@ -299,7 +299,7 @@ global_add_init(void *data, struct wl_registry *reg, uint32_t id, sh->shell = static_cast(wl_registry_bind(reg, id, &agl_shell_interface, - std::min(static_cast(8), version))); + std::min(static_cast(10), version))); agl_shell_add_listener(sh->shell, &shell_listener_init, data); sh->version = version; } @@ -578,6 +578,7 @@ int main(int argc, char **argv) ret = wl_display_dispatch(sh->wl_display); } + thread.join(); destroy_shell_data(sh); return 0; }