Merged 2342

This commit is contained in:
Moritz Bunkus 2004-10-10 08:51:10 +00:00
parent 09865c3ccf
commit ade3c7b68b
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2004-10-10 Moritz Bunkus <moritz@bunkus.org>
* mmg: bug fix: After loading saved mmg settings the track input
box listed the tracks always coming from the last input file and
not from the one they really came from.
2004-10-09 Moritz Bunkus <moritz@bunkus.org>
* mmg: enhancement: Made mmg's main window properly resizable.

View File

@ -1550,8 +1550,9 @@ tab_input::load(wxConfigBase *cfg) {
tracks.push_back(t);
fix_format("%s (ID %lld, type: %s) from %s", format);
name = fi.file_name->AfterLast(wxT(PSEP));
name += wxT(" (") + fi.file_name->BeforeLast(wxT(PSEP)) + wxT(")");
name = files[fidx].file_name->AfterLast(wxT(PSEP));
name += wxT(" (") + files[fidx].file_name->BeforeLast(wxT(PSEP)) +
wxT(")");
label.Printf(wxU(format.c_str()), t->ctype->c_str(), t->id,
t->type == 'a' ? wxT("audio") :
t->type == 'v' ? wxT("video") :