From 168cb64cdf3287fcd09128154399cd44fc77a0d2 Mon Sep 17 00:00:00 2001
From: Tapani Pihlajakuja <tapani.pihlajakuja@nokia.com>
Date: Wed, 8 Apr 2026 15:28:26 +0300
Subject: [PATCH] Fix BASOP issue 2513 by removing extra return.

---
 lib_com/options.h      | 1 +
 lib_rend/lib_rend_fx.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib_com/options.h b/lib_com/options.h
index e628cf13d..ff25731eb 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -122,6 +122,7 @@
 #define FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX        /* Nokia: BASOP 2497: Fix wrong subframe index in McMASA LFE synth. */
 #define FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN      /* Nokia: BASOP 2496: Fix wrong assignment in OMASA object edit code */
 #define FIX_2495_Q_ALIGN_OSBA_RENDERER                  /* FhG: Basop issue #2495: Corrected exponent scaling of outAudio.data_fx before buffer accumulation in renderSbaToBinaural(). */
+#define FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN           /* Nokia: BASOP issue 2513: Removes extra return block */
 
 /* ##################### End NON-BE switches ########################### */
 
diff --git a/lib_rend/lib_rend_fx.c b/lib_rend/lib_rend_fx.c
index 3c2b545f9..937824d8c 100644
--- a/lib_rend/lib_rend_fx.c
+++ b/lib_rend/lib_rend_fx.c
@@ -4028,9 +4028,11 @@ ivas_error IVAS_REND_Open(
                 return error;
             }
         }
+#ifndef FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN
         {
             return error;
         }
+#endif
     }
 
     return IVAS_ERR_OK;
-- 
GitLab