fix bug: -a and -t were not prevented from being used together (sf #1229481: https...

diff --git a/doc/html/changelog.html b/doc/html/changelog.html
index 25703a5..b468d21 100644 (file)
--- a/doc/html/changelog.html
+++ b/doc/html/changelog.html
@@ -83,12 +83,13 @@
                        <li>
                                flac:
                                <ul>
-                                       <li>Add support for encoding from non-compressed AIFF-C (<a href="https://sourceforge.net/tracker/?func=detail&atid=113478&aid=1090933&group_id=13478">SF #1090933</a>).</li>
+                                       <li>Add support for encoding from non-compressed AIFF-C (<a href="https://sourceforge.net/tracker/?func=detail&amp;atid=113478&amp;aid=1090933&amp;group_id=13478">SF #1090933</a>).</li>
                                        <li>Importing of non-CDDA-compliant cuesheets now only issues a warning, not an error (see <a href="http://www.hydrogenaudio.org/forums/index.php?showtopic=31282">here</a>).</li>
                                        <li>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.</li>
-                                       <li>Fixed a bug with --sector-align where appended samples were not always totally silent (<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=1237707&group_id=13478&atid=113478">SF #1237707</a>).</li>
+                                       <li>Fixed a bug that caused a crash when <span class="argument">-a</span> and <span class="argument">-t</span> were used together (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1229481&amp;group_id=13478&amp;atid=113478">SF #1229481</a>).</li>
+                                       <li>Fixed a bug with --sector-align where appended samples were not always totally silent (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1237707&amp;group_id=13478&amp;atid=113478">SF #1237707</a>).</li>
                                        <li>Fixed bugs with --sector-align and raw input files.</li>
-                                       <li>Fixed a bug printing out unknown AIFF subchunk names (<a href="https://sourceforge.net/tracker/index.php?func=detail&aid=1267476&group_id=13478&atid=113478">SF #1267476</a>).</li>
+                                       <li>Fixed a bug printing out unknown AIFF subchunk names (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1267476&amp;group_id=13478&amp;atid=113478">SF #1267476</a>).</li>
                                </ul>
                        </li>
                        <li>

diff --git a/src/flac/main.c b/src/flac/main.c
index e027ae5..1c80747 100644 (file)
--- 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");
                        }
                }