diff options
| author | Max Kellermann <max@duempel.org> | 2009-12-14 17:40:50 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-12-14 17:40:50 +0100 |
| commit | c3085d7b6130f24c3a1675e902bffb23775d5c3e (patch) | |
| tree | 9960c6e1dbbebd9b99f7cec3dab8e54f06ef8182 /src/mixer_control.c | |
| parent | 179502fe93532a3686c08f07d9ef6effaaf4f25a (diff) | |
| parent | 8f7bc70bf5e47da66e57e5606b978ba3ee975d89 (diff) | |
Merge branch 'v0.15.x'
Conflicts:
src/decoder/ffmpeg_plugin.c
Diffstat (limited to 'src/mixer_control.c')
| -rw-r--r-- | src/mixer_control.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mixer_control.c b/src/mixer_control.c index 42b59f51..af01600a 100644 --- a/src/mixer_control.c +++ b/src/mixer_control.c @@ -50,6 +50,10 @@ mixer_free(struct mixer *mixer) assert(mixer->plugin != NULL); assert(mixer->mutex != NULL); + /* mixers with the "global" flag set might still be open at + this point (see mixer_auto_close()) */ + mixer_close(mixer); + g_mutex_free(mixer->mutex); mixer->plugin->finish(mixer); |