Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-02 16:49:41 +02:00
Code Issues Releases Wiki Activity

Bug 1833 - Stop in Export Multiple does not actually stop the exports

Browse Source
This commit is contained in:
Leland Lucius 2020-03-23 07:01:13 -05:00
parent 440e3f8ff2
commit 7a7239f1da
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/export/ExportMultiple.cpp
View File

@ -865,7 +865,18 @@ ProgressResult ExportMultipleDialog::ExportMultipleByLabel(bool byName,
// Export it // Export it
ok = DoExport(pDialog, channels, activeSetting.destfile, false, ok = DoExport(pDialog, channels, activeSetting.destfile, false,
activeSetting.t0, activeSetting.t1, activeSetting.filetags); activeSetting.t0, activeSetting.t1, activeSetting.filetags);
if (ok != ProgressResult::Success && ok != ProgressResult::Stopped) { if (ok == ProgressResult::Stopped) {
AudacityMessageDialog dlgMessage(
nullptr,
XO("Continue to export remaining files?"),
XO("Export"),
wxYES_NO | wxNO_DEFAULT | wxICON_WARNING);
if (dlgMessage.ShowModal() != wxID_YES ) {
// User decided not to continue - bail out!
break;
}
}
else if (ok != ProgressResult::Success) {
break; break;
} }
} }
@ -1000,9 +1011,18 @@ ProgressResult ExportMultipleDialog::ExportMultipleByTrack(bool byName,
ok = DoExport(pDialog, ok = DoExport(pDialog,
activeSetting.channels, activeSetting.destfile, true, activeSetting.channels, activeSetting.destfile, true,
activeSetting.t0, activeSetting.t1, activeSetting.filetags); activeSetting.t0, activeSetting.t1, activeSetting.filetags);
if (ok == ProgressResult::Stopped) {
// Stop if an error occurred AudacityMessageDialog dlgMessage(
if (ok != ProgressResult::Success && ok != ProgressResult::Stopped) { nullptr,
XO("Continue to export remaining files?"),
XO("Export"),
wxYES_NO | wxNO_DEFAULT | wxICON_WARNING);
if (dlgMessage.ShowModal() != wxID_YES ) {
// User decided not to continue - bail out!
break;
}
}
else if (ok != ProgressResult::Success) {
break; break;
} }
// increment export counter // increment export counter