Fixes inability to lower audio buffer size

2 files changed, 4 insertions, 6 deletions

diff --git a/core.c b/core.c
index 29544b6..9122695 100644
--- a/core.c
+++ b/core.c
@@ -443,7 +443,7 @@ static bool pa_environment(unsigned cmd, void *data) {
 		const unsigned *latency_ms = (const unsigned *)data;
 		if (latency_ms) {
 			unsigned frames = *latency_ms * frame_rate / 1000;
-			if (frames > audio_buffer_size && frames < 30)
+			if (frames < 30)
 				audio_buffer_size_override = frames;
 			else
 				PA_WARN("Audio buffer change out of range (%d), ignored\n", frames);
diff --git a/main.c b/main.c
index 0b1ec36..af55f0f 100644
--- a/main.c
+++ b/main.c
@@ -12,6 +12,7 @@
 #include "menu.h"
 #include "overrides.h"
 #include "plat.h"
+#include "util.h"
 
 #ifdef MMENU
 #include <dlfcn.h>
@@ -480,12 +481,9 @@ static void adjust_audio(void) {
 	static unsigned prev_audio_buffer_size = 0;
 
 	if (!prev_audio_buffer_size)
-		prev_audio_buffer_size = audio_buffer_size;
+		prev_audio_buffer_size = current_audio_buffer_size;
 
-	current_audio_buffer_size =
-		audio_buffer_size > audio_buffer_size_override
-		? audio_buffer_size
-		: audio_buffer_size_override;
+	current_audio_buffer_size = MAX(audio_buffer_size, audio_buffer_size_override);
 
 	if (prev_audio_buffer_size != current_audio_buffer_size) {
 		PA_INFO("Resizing audio buffer from %d to %d frames\n",