Merged 2370

This commit is contained in:
Moritz Bunkus 2004-10-17 08:43:23 +00:00
parent 71edb3d50f
commit f5a51f891f
2 changed files with 15 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2004-10-17 Moritz Bunkus <moritz@bunkus.org>
* mmg: Added an error message if the user selects 'mmg' as the
'mkvmerge executable' because that would lead to an infinite
number of 'mmg's being spawned.
2004-10-16 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: If LFE is on for DTS then the number of

View File

@ -153,6 +153,15 @@ tab_settings::on_browse(wxCommandEvent &evt) {
#endif
wxOPEN);
if(dlg.ShowModal() == wxID_OK) {
wxString file_name;
file_name = dlg.GetPath().AfterLast('/').AfterLast('\\').Lower();
if ((file_name == wxT("mmg.exe")) || (file_name == wxT("mmg"))) {
wxMessageBox(wxT("Please do not select 'mmg' itself as the 'mkvmerge' "
"executable."), wxT("Wrong file chosen"),
wxOK | wxCENTER | wxICON_ERROR);
return;
}
tc_mkvmerge->SetValue(dlg.GetPath());
mkvmerge_path = dlg.GetPath();
save_preferences();