2 files changed, 7 insertions, 5 deletions

diff --git a/apps/dsp.c b/apps/dsp.c
index 5910504122..3aab2f2df5 100644
--- a/apps/dsp.c
+++ b/apps/dsp.c
@@ -1475,12 +1475,12 @@ intptr_t dsp_configure(struct dsp_config *dsp, int setting, intptr_t value)
 
     case DSP_SET_TRACK_GAIN:
         if (dsp == &AUDIO_DSP)
-            dsp_set_gain_var(&track_gain, convert_gain(value));
+            dsp_set_gain_var(&track_gain, value ? convert_gain(value) : 0);
         break;
 
     case DSP_SET_ALBUM_GAIN:
         if (dsp == &AUDIO_DSP)
-            dsp_set_gain_var(&album_gain, convert_gain(value));
+            dsp_set_gain_var(&album_gain, value ? convert_gain(value) : 0);
         break;
 
     case DSP_SET_TRACK_PEAK:
diff --git a/apps/replaygain.c b/apps/replaygain.c
index 3b47974d58..02be033657 100644
--- a/apps/replaygain.c
+++ b/apps/replaygain.c
@@ -35,6 +35,8 @@
 
 #define FP_BITS         (12)
 #define FP_ONE          (1 << FP_BITS)
+#define FP_MIN          (-48 * FP_ONE)
+#define FP_MAX          ( 17 * FP_ONE)
 
 void replaygain_itoa(char* buffer, int length, long int_gain)
 {
@@ -121,10 +123,10 @@ long convert_gain(long gain)
     /* Don't allow unreasonably low or high gain changes.
      * Our math code can't handle it properly anyway. :)
      */
-    gain = MAX(gain,-48 * FP_ONE);
-    gain = MIN(gain, 17 * FP_ONE);
+    gain = MAX(gain, FP_MIN);
+    gain = MIN(gain, FP_MAX);
 
-    return (gain) ? fp_factor(gain, FP_BITS) << (24 - FP_BITS) : 0;
+    return fp_factor(gain, FP_BITS) << (24 - FP_BITS);
 }
 
 /* Get the sample scale factor in Q19.12 format from a gain value. Returns 0