Fixed icon path and spaces in paths bug

wghost · Dec 19, 2013 · 768e583 · 768e583
1 parent c7d7e8d
commit 768e583
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/PatcherGUI/PatcherGUIMain.cpp b/PatcherGUI/PatcherGUIMain.cpp
@@ -56,7 +56,7 @@ PatcherGUIFrame::PatcherGUIFrame(wxWindow* parent,wxWindowID id)
     Create(parent, wxID_ANY, _("XCOM UPK Patcher"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE, _T("wxID_ANY"));
     {
     	wxIcon FrameIcon;
-    	FrameIcon.CopyFromBitmap(wxBitmap(wxImage(_T("D:\\CodeBlocksProj\\UPKUtils\\PatcherGUI\\favicon.ico"))));
+    	FrameIcon.CopyFromBitmap(wxBitmap(wxImage(_T("favicon.ico"))));
     	SetIcon(FrameIcon);
     }
     BoxSizer1 = new wxBoxSizer(wxHORIZONTAL);
@@ -146,17 +146,21 @@ bool PatcherGUIFrame::LoadCFG()
     if (cfg.is_open())
     {
         std::string str = "";
-        cfg >> str;
+        //cfg >> str;
+        getline(cfg, str);
         if (wxDirExists(str + "\\XComGame\\CookedPCConsole"))
         {
             TextCtrl1->SetValue(str);
             bSelectPath = true;
         }
-        cfg >> str;
+        //cfg >> str;
+        getline(cfg, str);
         BackupPathString = str;
-        cfg >> str;
+        //cfg >> str;
+        getline(cfg, str);
         PatchUPKprogram = str;
-        cfg >> str;
+        //cfg >> str;
+        getline(cfg, str);
         DecompressProgram = str;
         return true;
     }

diff --git a/PatcherGUI/resource.rc b/PatcherGUI/resource.rc
@@ -1,3 +1,3 @@
-aaaa ICON "wx/msw/std.ico"
+aaaa ICON "favicon.ico"
 
 #include "wx/msw/wx.rc"
diff --git a/PatcherGUI/wxsmith/PatcherGUIframe.wxs b/PatcherGUI/wxsmith/PatcherGUIframe.wxs
@@ -2,7 +2,7 @@
 <wxsmith>
 	<object class="wxFrame" name="PatcherGUIFrame">
 		<title>XCOM UPK Patcher</title>
-		<icon>D:\CodeBlocksProj\UPKUtils\PatcherGUI\favicon.ico</icon>
+		<icon>favicon.ico</icon>
 		<id_arg>0</id_arg>
 		<handler function="OnClose" entry="EVT_CLOSE" />
 		<object class="wxBoxSizer" variable="BoxSizer1" member="no">