summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Vlad <marius.vlad@collabora.com>2023-10-24 16:51:59 +0300
committerMarius Vlad <marius.vlad@collabora.com>2023-10-24 16:51:59 +0300
commitd8e72099ecbcadc6e8b242686cf012763a5f1a3a (patch)
tree1f0916e475fdfd6fe952ccbe0a24ff24411f641c
parentca537df2c52990acf97fb1c42ec2d993c60eae2d (diff)
grpc-proxy: Terminate thread when we're exiting
We need to be joining the thread to be able to exit properly, so let us do that. Bug-AGL: SPEC-4935 Signed-off-by: Marius Vlad <marius.vlad@collabora.com> Change-Id: Ib4e54fcb23267b632f61c10d6ec2835c55ec2f23
-rw-r--r--grpc-proxy/main-grpc.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/grpc-proxy/main-grpc.cpp b/grpc-proxy/main-grpc.cpp
index b2eca84..5b07d64 100644
--- a/grpc-proxy/main-grpc.cpp
+++ b/grpc-proxy/main-grpc.cpp
@@ -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;
}