From ef8828426c63dbabb5c402095eccc592515e1d91 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 31 Dec 2004 16:16:58 +0000 Subject: [PATCH] Don't convert the command line shown in the "command line" window to UTF-8 as it causes too many problems. mmg doesn't use that command line anyway because it puts its arguments into "option files". --- src/mmg/mmg.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/mmg/mmg.cpp b/src/mmg/mmg.cpp index 4855b3f37..ce373436a 100644 --- a/src/mmg/mmg.cpp +++ b/src/mmg/mmg.cpp @@ -1104,7 +1104,7 @@ mmg_dialog::update_command_line() { old_cmdline = cmdline; cmdline = wxT("\"") + mkvmerge_path + wxT("\" -o \"") + - tc_output->GetValue() + wxT("\" ") + wxT("--command-line-charset UTF-8 "); + tc_output->GetValue() + wxT("\" "); clargs.Clear(); clargs.Add(mkvmerge_path); @@ -1365,14 +1365,6 @@ mmg_dialog::update_command_line() { cmdline += wxT(" ") + shell_escape(clargs[i]); } -#if WXUNICODE - string utf8, tmp; - utf8 = to_utf8(cmdline); - tmp = to_utf8(utf8_init("ISO8859-1"), utf8.c_str()); - cmdline = wxU(tmp.c_str()); -#else - cmdline = to_utf8(cmdline).c_str(); -#endif if (old_cmdline != cmdline) tc_cmdline->SetValue(cmdline); }