diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2023-10-24 16:51:59 +0300 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2023-10-27 13:58:47 +0300 |
| commit | 79f0ed38527fc9872cff6741a565980967818223 (patch) | |
| tree | 173596e4ba9497073ec8bdd423ccae4978be461d | |
| parent | 951af503f19d942e5552a4e15104fb961f722221 (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
(cherry picked from commit d8e72099ecbcadc6e8b242686cf012763a5f1a3a)
| -rw-r--r-- | grpc-proxy/main-grpc.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/grpc-proxy/main-grpc.cpp b/grpc-proxy/main-grpc.cpp index 1e297c5..b719206 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; } |