mirror of
https://gitlab.com/mbunkus/mkvtoolnix.git
synced 2024-12-24 20:01:53 +00:00
Merged 2370
This commit is contained in:
parent
71edb3d50f
commit
f5a51f891f
@ -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
|
||||
|
@ -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();
|
||||
|
Loading…
Reference in New Issue
Block a user