Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-04 09:15:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mmg will again set the output file name for the 'first input file' method if the 'remove all' button is used.

Browse Source
This commit is contained in:
Moritz Bunkus 2007-07-08 17:30:57 +00:00
parent 272706ce9d
commit d02e58868a
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mmg/mmg.cpp
View File

@ -943,8 +943,6 @@ mmg_dialog::on_file_new(wxCommandEvent &evt) {
wxRemoveFile(tmp_name); wxRemoveFile(tmp_name);
set_status_bar(wxT("Configuration cleared.")); set_status_bar(wxT("Configuration cleared."));
first_input_directory.Clear();
} }
void void
@ -1842,15 +1840,10 @@ mmg_dialog::set_output_maybe(const wxString &new_output) {
output = previous_output_directory; output = previous_output_directory;
else if (ODM_FIXED == options.output_directory_mode) else if (ODM_FIXED == options.output_directory_mode)
output = options.output_directory; output = options.output_directory;
else
output = first_input_directory;
if (output.IsEmpty()) if (output.IsEmpty())
output = filename.GetPath(); output = filename.GetPath();
if (first_input_directory.IsEmpty())
first_input_directory = filename.GetPath();
output += wxFileName::GetPathSeparator() + filename.GetName() output += wxFileName::GetPathSeparator() + filename.GetName()
+ (has_video ? wxU(".mkv") : has_audio ? wxU(".mka") : wxU(".mks")); + (has_video ? wxU(".mkv") : has_audio ? wxU(".mka") : wxU(".mks"));

2
src/mmg/mmg_dialog.h
View File

@ -82,7 +82,7 @@ class mmg_dialog: public wxFrame {
public: public:
wxButton *b_browse_output; wxButton *b_browse_output;
wxTextCtrl *tc_output; wxTextCtrl *tc_output;
wxString previous_output_directory, first_input_directory; wxString previous_output_directory;
wxString cmdline, cli_options; wxString cmdline, cli_options;
wxArrayString clargs; wxArrayString clargs;