From b1d7f1a40c8f08acdf566b2259c05aa18f055311 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Mon, 25 Jul 2005 18:23:36 +0000
Subject: [PATCH] Do the setup before trying to convert the command line to
 UTF-8. Otherwise arguments with non-ASCII characters are not converted
 correctly.

---
 ChangeLog            | 6 ++++++
 src/info/gui.cpp     | 1 -
 src/info/mkvinfo.cpp | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5b78e9bc6..41b0ed26f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-25  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvinfo: bug fix: Files with non-ASCII chars weren't opened
+	because conversion to UTF-8 was done before the charset routines
+	were initialized.
+
 2005-07-20  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: bug fix: Fixed a crash if a track in a MP4/QuickTime
diff --git a/src/info/gui.cpp b/src/info/gui.cpp
index c5e65726d..6273f9bab 100644
--- a/src/info/gui.cpp
+++ b/src/info/gui.cpp
@@ -68,7 +68,6 @@ mi_app::OnInit() {
     return false;
   }
 
-  setup();
   frame = new mi_frame(wxT("mkvinfo"), wxPoint(50, 50), wxSize(600, 400));
   frame->Show(true);
   frame->Refresh(true);
diff --git a/src/info/mkvinfo.cpp b/src/info/mkvinfo.cpp
index 15ac8e716..b161dceb5 100644
--- a/src/info/mkvinfo.cpp
+++ b/src/info/mkvinfo.cpp
@@ -1988,7 +1988,6 @@ console_main(vector<string> args) {
   nice(2);
 #endif
 
-  setup();
   parse_args(args, file_name);
   if (file_name == "") {
     usage();
@@ -2018,6 +2017,8 @@ main(int argc,
   vector<string> args;
   string initial_file;
 
+  setup();
+
   args = command_line_utf8(argc, argv);
   parse_args(args, initial_file);