Fixes AudioDevice.disableHrtf() (backport from master)

Signed-off-by: Matthias <webmaster@pottgames.de>
Hangman · Jan 22, 2024 · 28906c2 · 28906c2
1 parent eab9ffa
commit 28906c2
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/core/src/main/java/de/pottgames/tuningfork/AudioDevice.java b/core/src/main/java/de/pottgames/tuningfork/AudioDevice.java
@@ -470,6 +470,11 @@ public boolean enableHrtf(String specifier) {
      * Disables hrtf on this device.
      */
     public void disableHrtf() {
+        if (!this.isHrtfSupported()) {
+            this.logger.warn(this.getClass(), "HRTF is not supported by this device and was never enabled.");
+            return;
+        }
+
         if (this.isHrtfSupported()) {
             // SET NEW DEVICE ATTRIBUTES
             final ContextAttributes oldAttributes = this.contextAttributes;
@@ -485,15 +490,16 @@ public void disableHrtf() {
             this.contextAttributes = new ContextAttributes(attributes);
 
             // RESET DEVICE
-            if (SOFTHRTF.alcResetDeviceSOFT(this.deviceHandle, attributes)) {
-                this.hrtfEnabled = false;
-                this.logger.info(this.getClass(), "HRTF disabled.");
-            } else {
+            if (!SOFTHRTF.alcResetDeviceSOFT(this.deviceHandle, this.contextAttributes.getBuffer())) {
                 this.contextAttributes = oldAttributes;
                 this.logger.error(this.getClass(), "Failed to reset device: " + ALC10.alcGetString(this.deviceHandle, ALC10.alcGetError(this.deviceHandle)));
+                return;
+            }
+            this.hrtfEnabled = false;
+            this.logger.info(this.getClass(), "HRTF disabled.");
+            if (this.deviceRerouter != null) {
+                this.deviceRerouter.updateContextAttributes(this.contextAttributes);
             }
-        } else {
-            this.logger.warn(this.getClass(), "HRTF is not supported by this device and was therefore never enabled.");
         }
     }