From c220f55792c075a054158552b64a38b823d0ecfc Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 27 Feb 2005 21:54:26 +0000 Subject: [PATCH] Fixed the removal of appended files if there is no track from another file between two tracks from the file that is to be removed. --- ChangeLog | 4 ++++ src/mmg/tab_input.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7460b2c7c..436338bc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-02-27 Moritz Bunkus + * mmg: bug fix: An "appended" file could not be removed if there + were two tracks that we not separated by a track from another file + in the track list box. + * mmg: bug fix: The check whether or not a file might be overwritten while splitting is active has been fixed. diff --git a/src/mmg/tab_input.cpp b/src/mmg/tab_input.cpp index 91056aa1e..51a6b8e62 100644 --- a/src/mmg/tab_input.cpp +++ b/src/mmg/tab_input.cpp @@ -983,7 +983,8 @@ tab_input::on_remove_file(wxCommandEvent &evt) { // Files may not be removed if something else is still being appended to // them. for (i = 0; i < (tracks.size() - 1); i++) - if ((tracks[i]->source == selected_file) && tracks[i + 1]->appending) { + if ((tracks[i]->source == selected_file) && tracks[i + 1]->appending && + (tracks[i]->source != tracks[i + 1]->source)) { wxString err; err.Printf(wxT("The current file (number %d) cannot be removed. There "