Merge branch 'maint'

This fix for an ancient bug should also be in master.

* maint:
  server: Fix return value of com_ff().

diff --git a/command.c b/command.c
index 6568b789339b25125fd54fad90d03abeceb515a2..aac344bc8027bd1dd638450af629740fbc36d875 100644 (file)
--- a/command.c
+++ b/command.c
@@ -684,6 +684,7 @@ static int com_ff(__a_unused struct command_context *cc,
        ret = -E_NO_AUDIO_FILE;
        if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
                goto out;
+       ret = 1;
        promille = (1000 * mmd->current_chunk) / mmd->afd.afhi.chunks_total;
        if (backwards)
                promille -= 1000 * i / mmd->afd.afhi.seconds_total;
@@ -699,7 +700,6 @@ static int com_ff(__a_unused struct command_context *cc,
        mmd->new_vss_status_flags |= VSS_REPOS;
        mmd->new_vss_status_flags &= ~VSS_NEXT;
        mmd->events++;
-       ret = 1;
 out:
        mutex_unlock(mmd_mutex);
        return ret;