Skip to content

M
mpd
Commit 6c480d7d authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

pulse_mixer: removed superfluous NULL checks in close()

When the MPD core knows that the pulse mixer is open, pm->mainloop and pm->context must be non-NULL.
parent 8cf206f2
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 12 deletions
src/mixer/pulse_mixer.c
View file @ 6c480d7d
......@@ -255,19 +255,11 @@ static void
pulse_mixer_close(G_GNUC_UNUSED struct mixer *data)
{
struct pulse_mixer *pm=(struct pulse_mixer *) data;
if (pm->mainloop)
pa_threaded_mainloop_stop(pm->mainloop);
if (pm->context) {
pa_context_disconnect(pm->context);
pa_context_unref(pm->context);
pm->context = NULL;
}
if (pm->mainloop) {
pa_threaded_mainloop_free(pm->mainloop);
pm->mainloop = NULL;
}
pa_threaded_mainloop_stop(pm->mainloop);
pa_context_disconnect(pm->context);
pa_context_unref(pm->context);
pa_threaded_mainloop_free(pm->mainloop);
pm->online = false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment