diff --git a/doc/html/changelog.html b/doc/html/changelog.html
index 25703a52..b468d213 100644
--- a/doc/html/changelog.html
+++ b/doc/html/changelog.html
@@ -83,12 +83,13 @@
flac:
- - Add support for encoding from non-compressed AIFF-C (SF #1090933).
+ - Add support for encoding from non-compressed AIFF-C (SF #1090933).
- Importing of non-CDDA-compliant cuesheets now only issues a warning, not an error (see here).
- Fixed a bug in cuesheet parsing where it would return an error if the last line of the cuesheet did not end with a newline.
- - Fixed a bug with --sector-align where appended samples were not always totally silent (SF #1237707).
+ - Fixed a bug that caused a crash when -a and -t were used together (SF #1229481).
+ - Fixed a bug with --sector-align where appended samples were not always totally silent (SF #1237707).
- Fixed bugs with --sector-align and raw input files.
- - Fixed a bug printing out unknown AIFF subchunk names (SF #1267476).
+ - Fixed a bug printing out unknown AIFF subchunk names (SF #1267476).
diff --git a/src/flac/main.c b/src/flac/main.c
index e027ae52..1c80747d 100644
--- a/src/flac/main.c
+++ b/src/flac/main.c
@@ -347,6 +347,8 @@ int do_it()
return usage_error("ERROR: --until is not allowed in test mode\n");
if(0 != option_values.cue_specification)
return usage_error("ERROR: --cue is not allowed in test mode\n");
+ if(0 != option_values.analyze)
+ return usage_error("ERROR: analysis mode (-a/--analyze) and test mode (-t/--test) cannot be used together\n");
}
}