From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 6 May 2018 08:37:42 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.6.2~8
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=2031b9cab9304b02c0372f73eef54d9501277031;hp=c517cb88ae745c9be06ac5cd99236c4bae8575c9

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 6568b789..aac344bc 100644
--- 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;