From: Andre Noll <maan@systemlinux.org>
Date: Sun, 6 Jul 2008 18:51:04 +0000 (+0200)
Subject: Fix com_touch.
X-Git-Tag: v0.3.3~52^2~4
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=cb1265c87fdb0e817923bf09c47162a7f894aafc

Fix com_touch.

The check whether no options were given was busted.
---

diff --git a/aft.c b/aft.c
index a8fe0810..e29c15a0 100644
--- a/aft.c
+++ b/aft.c
@@ -1925,7 +1925,7 @@ struct com_touch_options {
 	/** New image id. */
 	int32_t image_id;
 	/** New amplification value. */
-	uint8_t amp;
+	int32_t amp;
 	/** Command line flags (see \ref touch_flags). */
 	unsigned flags;
 };
@@ -1947,7 +1947,7 @@ static int touch_audio_file(__a_unused struct osl_table *table,
 	struct osl_object obj;
 	struct afs_info old_afsi, new_afsi;
 	int ret, no_options = tad->cto->num_played < 0 && tad->cto->last_played < 0 &&
-		tad->cto->lyrics_id < 0 && tad->cto->image_id < 0;
+		tad->cto->lyrics_id < 0 && tad->cto->image_id < 0 && tad->cto->amp < 0;
 	struct afsi_change_event_data aced;
 
 	ret = get_afsi_object_of_row(row, &obj);
@@ -2030,7 +2030,7 @@ int com_touch(int fd, int argc, char * const * const argv)
 		.last_played = -1,
 		.lyrics_id = -1,
 		.image_id = -1,
-		.amp = 0,
+		.amp = -1,
 	};
 	struct osl_object query = {.data = &cto, .size = sizeof(cto)};
 	int i, ret;