From 672e309d893375a263e57d23f3d17d2d17406299 Mon Sep 17 00:00:00 2001 From: Linus Dierheimer Date: Fri, 27 Jan 2023 11:21:01 +0100 Subject: [PATCH] Small fixes --- src/common/dbus.c | 2 +- src/detection/sound/sound_linux.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/common/dbus.c b/src/common/dbus.c index 38869668d..1d2840b2f 100644 --- a/src/common/dbus.c +++ b/src/common/dbus.c @@ -202,4 +202,4 @@ void ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char* dbus->lib->ffdbus_message_unref(reply); } -#endif //FF_DBUS_H +#endif //FF_HAVE_DBUS diff --git a/src/detection/sound/sound_linux.c b/src/detection/sound/sound_linux.c index e36bf2963..0e25d5629 100644 --- a/src/detection/sound/sound_linux.c +++ b/src/detection/sound/sound_linux.c @@ -105,20 +105,17 @@ static const char* detectSound(const FFinstance* instance, FFlist* devices) ffpa_operation_unref(operation); operation = ffpa_context_get_server_info(context, paServerInfoCallback, devices); - if(!operation) + if(operation) { - ffpa_context_unref(context); - ffpa_mainloop_free(mainloop); - return "Failed to get pulseaudio server info"; + while(ffpa_operation_get_state(operation) == PA_OPERATION_RUNNING) + ffpa_mainloop_iterate(mainloop, 1, NULL); + + ffpa_operation_unref(operation); } - while(ffpa_operation_get_state(operation) == PA_OPERATION_RUNNING) - ffpa_mainloop_iterate(mainloop, 1, NULL); - - ffpa_operation_unref(operation); - ffpa_context_unref(context); ffpa_mainloop_free(mainloop); + dlclose(pulse); return NULL; }