mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw-cli: quit when we quit

Browse source
This commit is contained in:
Wim Taymans 2020-07-16 12:49:17 +02:00
parent 5afdd507c3
commit 9caccb6125
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tools/pw-cli.c
View file

@ -56,6 +56,7 @@ struct data {
struct pw_map vars; struct pw_map vars;
unsigned int interactive:1; unsigned int interactive:1;
unsigned int monitoring:1; unsigned int monitoring:1;
unsigned int quit:1;
}; };
struct global { struct global {
@ -2754,6 +2755,7 @@ static void do_input(void *data, int fd, uint32_t mask)
static void do_quit(void *data, int signal_number) static void do_quit(void *data, int signal_number)
{ {
struct data *d = data; struct data *d = data;
d->quit = true;
pw_main_loop_quit(d->loop); pw_main_loop_quit(d->loop);
} }
@ -2834,7 +2836,6 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
if (optind == argc) { if (optind == argc) {
data.interactive = true; data.interactive = true;
@ -2859,7 +2860,7 @@ int main(int argc, char *argv[])
fprintf(stdout, "Error: \"%s\"\n", error); fprintf(stdout, "Error: \"%s\"\n", error);
free(error); free(error);
} }
if (data.current) { if (!data.quit && data.current) {
data.current->prompt_pending = pw_core_sync(data.current->core, 0, 0); data.current->prompt_pending = pw_core_sync(data.current->core, 0, 0);
pw_main_loop_run(data.loop); pw_main_loop_run(data.loop);
} }