Smaller stuff that went uncommitted

Signed-off-by: Andrew Opalach <andrew@akon.city>

2 files changed, 5 insertions, 4 deletions

diff --git a/src/mixer/meson.build b/src/mixer/meson.build
index f65d624..cf67fbb 100644
--- a/src/mixer/meson.build
+++ b/src/mixer/meson.build
@@ -2,8 +2,7 @@ mixer_src = ['mixer.c', 'audio_null.c']
 mixer_deps = []
 mixer_args = []
 
-use_miniaudio = true
-if use_miniaudio
+if 'miniaudio' in get_option('audio-backends')
   miniaudio = subproject('miniaudio').get_variable('miniaudio')
   mixer_src += ['audio_miniaudio.c']
   mixer_deps += [miniaudio]
diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c
index c578689..9f589cc 100644
--- a/src/mixer/mixer.c
+++ b/src/mixer/mixer.c
@@ -200,7 +200,7 @@ void camu_mixer_add_buffer(struct camu_mixer *mixer, struct camu_audio_buffer *b
     al_array_foreach(mixer->add_queue, i, queued) {
         if (queued == buf) {
             nn_mutex_unlock(&mixer->mutex);
-            return;
+            al_assert_and_return();
         }
     }
     al_array_foreach_rev(mixer->rem_queue, i, queued) {
@@ -320,5 +320,7 @@ void camu_mixer_close(struct camu_mixer *mixer)
     al_array_free(mixer->rem_queue);
     nn_mutex_destroy(&mixer->mutex);
 #endif
-    mixer->audio->free(&mixer->audio);
+    if (mixer->audio) {
+        mixer->audio->free(&mixer->audio);
+    }
 }