From d02e58868a7df4cf34b06af5f7c853686da13188 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 8 Jul 2007 17:30:57 +0000 Subject: [PATCH] mmg will again set the output file name for the 'first input file' method if the 'remove all' button is used. --- src/mmg/mmg.cpp | 7 ------- src/mmg/mmg_dialog.h | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/mmg/mmg.cpp b/src/mmg/mmg.cpp index 1fe4c0742..f6184dc0c 100644 --- a/src/mmg/mmg.cpp +++ b/src/mmg/mmg.cpp @@ -943,8 +943,6 @@ mmg_dialog::on_file_new(wxCommandEvent &evt) { wxRemoveFile(tmp_name); set_status_bar(wxT("Configuration cleared.")); - - first_input_directory.Clear(); } void @@ -1842,15 +1840,10 @@ mmg_dialog::set_output_maybe(const wxString &new_output) { output = previous_output_directory; else if (ODM_FIXED == options.output_directory_mode) output = options.output_directory; - else - output = first_input_directory; if (output.IsEmpty()) output = filename.GetPath(); - if (first_input_directory.IsEmpty()) - first_input_directory = filename.GetPath(); - output += wxFileName::GetPathSeparator() + filename.GetName() + (has_video ? wxU(".mkv") : has_audio ? wxU(".mka") : wxU(".mks")); diff --git a/src/mmg/mmg_dialog.h b/src/mmg/mmg_dialog.h index 9b5b53a27..e796ae817 100644 --- a/src/mmg/mmg_dialog.h +++ b/src/mmg/mmg_dialog.h @@ -82,7 +82,7 @@ class mmg_dialog: public wxFrame { public: wxButton *b_browse_output; wxTextCtrl *tc_output; - wxString previous_output_directory, first_input_directory; + wxString previous_output_directory; wxString cmdline, cli_options; wxArrayString clargs;