From 319bd223d96f812ef99c62d6456e2ba6c9695178 Mon Sep 17 00:00:00 2001
From: WrinklyNinja <wrinklyninja1@gmail.com>
Date: Fri, 14 Jun 2013 18:34:23 +0100
Subject: [PATCH] Fixed userlist path getting scrambled in metadata editor.

Started groundwork for metadata editor UI issue #25 work.
---
 src/gui/editor.cpp | 4 ++--
 src/gui/editor.h   | 6 ++++--
 src/gui/main.cpp   | 6 +++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/gui/editor.cpp b/src/gui/editor.cpp
index fa2f10b9..03699675 100644
--- a/src/gui/editor.cpp
+++ b/src/gui/editor.cpp
@@ -64,7 +64,7 @@ wxString State[2] = {
     translate("Remove")
 };
 
-Editor::Editor(wxWindow *parent, const wxString& title, const char * userlistPath, const std::vector<boss::Plugin>& basePlugins, std::vector<boss::Plugin>& editedPlugins) : wxFrame(parent, wxID_ANY, title), _userlistPath(userlistPath), _basePlugins(basePlugins), _editedPlugins(editedPlugins) {
+Editor::Editor(wxWindow *parent, const wxString& title, const std::string userlistPath, const std::vector<boss::Plugin>& basePlugins, std::vector<boss::Plugin>& editedPlugins, const unsigned int language) : wxFrame(parent, wxID_ANY, title), _userlistPath(userlistPath), _basePlugins(basePlugins), _editedPlugins(editedPlugins), _language(language) {
 
     //Initialise child windows.
     listBook = new wxNotebook(this, BOOK_Lists);
@@ -639,7 +639,7 @@ void Editor::OnQuit(wxCommandEvent& event) {
              << YAML::Key << "plugins" << YAML::Value << _editedPlugins
              << YAML::EndMap;
 
-        ofstream out(_userlistPath);
+        ofstream out(_userlistPath.c_str());
         out << yout.c_str();
         out.close();
     }
diff --git a/src/gui/editor.h b/src/gui/editor.h
index 19783e26..1973d440 100644
--- a/src/gui/editor.h
+++ b/src/gui/editor.h
@@ -34,7 +34,7 @@
 
 class Editor : public wxFrame {
 public:
-    Editor(wxWindow *parent, const wxString& title, const char * userlistPath, const std::vector<boss::Plugin>& basePlugins, std::vector<boss::Plugin>& editedPlugins);
+    Editor(wxWindow *parent, const wxString& title, const std::string userlistPath, const std::vector<boss::Plugin>& basePlugins, std::vector<boss::Plugin>& editedPlugins, const unsigned int language);
 
     void OnPluginSelect(wxListEvent& event);
     void OnEnabledToggle(wxCommandEvent& event);
@@ -65,9 +65,11 @@ private:
     wxSpinCtrl * prioritySpin;
     wxStaticText * pluginText;
 
-    const char * _userlistPath;
+    const std::string _userlistPath;
     const std::vector<boss::Plugin> _basePlugins;
     std::vector<boss::Plugin> _editedPlugins;
+    const unsigned int _language;
+    std::vector<boss::Message> currentMessages;
 
     void ApplyEdits(const wxString& plugin);
     
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 3ed0f029..9bdb24c0 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -735,9 +735,13 @@ void Launcher::OnEditMetadata(wxCommandEvent& event) {
     std::sort(installed.begin(), installed.end(), boss::alpha_sort);
     
     progDia->Pulse();
+    
+    unsigned int lang = boss::LANG_AUTO;
+    if (_settings["Language"].as<string>() == "eng")
+        lang = boss::LANG_ENG;
 
     //Create editor window.
-    Editor *editor = new Editor(this, translate("BOSS: Metadata Editor"), _game.UserlistPath().string().c_str(), installed, ulist_plugins);
+    Editor *editor = new Editor(this, translate("BOSS: Metadata Editor"), _game.UserlistPath().string(), installed, ulist_plugins, lang);
     
     progDia->Destroy();