1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-02 16:49:41 +02:00

Re-order the conditionals from Steve's patch for bugs 428 and 430, so that it doesn't check twice for all audio being muted, and does that check before checking for label issues.

This commit is contained in:
v.audacity 2013-01-08 00:44:57 +00:00
parent eaca51bbef
commit a35b11b340
2 changed files with 14 additions and 14 deletions

View File

@ -490,9 +490,9 @@ bool Exporter::ExamineTracks()
if (mNumSelected == 0) {
wxString message;
if(mSelectedOnly)
message = _("All the selected audio is muted.");
message = _("All selected audio is muted.");
else
message = _("All the audio is muted.");
message = _("All audio is muted.");
wxMessageBox(message,
_("Unable to export"),
wxOK | wxICON_INFORMATION);

View File

@ -171,21 +171,21 @@ void ExportMultiple::CountTracksAndLabels()
int ExportMultiple::ShowModal()
{
if (mNumWaveTracks < 2 && mNumLabels < 1) {
::wxMessageBox(_("If you have more than one Audio Track, you can\nexport each track \
as a separate audio file.\n\nIf you have a Label Track, you can export a separate\naudio file \
for each label in that track. You can have\nmore than one Label Track, but files will only \
be\nexported for the uppermost Label Track.\n\nMuted tracks will not be exported.\n\nThis \
Project does not meet the above criteria for\nexporting multiple files."),
_("Cannot Export"),
// Cannot export if all audio tracks are muted.
if (mNumWaveTracks == 0) {
::wxMessageBox(_("All audio is muted."),
_("Cannot Export Multiple"),
wxOK | wxCENTRE, this);
return wxID_CANCEL;
}
// Cannot export if all audio tracks are muted.
if (mNumWaveTracks == 0) {
::wxMessageBox(_("All the audio is muted."),
_("Cannot Export"),
if (mNumWaveTracks < 2 && mNumLabels < 1) {
::wxMessageBox(_(
"You have only one unmuted Audio Track and no applicable \
\nlabels, so you cannot export to separate audio files. \
\n\nYou can have more than one Label Track, but files will \
\nbe exported based only on the uppermost Label Track."),
_("Cannot Export Multiple"),
wxOK | wxCENTRE, this);
return wxID_CANCEL;
}