diff --git a/WeeXnes/Core/Globals.cs b/WeeXnes/Core/Globals.cs
index 9f59b3f..c2524dc 100644
--- a/WeeXnes/Core/Globals.cs
+++ b/WeeXnes/Core/Globals.cs
@@ -13,10 +13,14 @@ namespace WeeXnes.Core
{
public static string encryptionKey = "8zf5#RdyQ]$4x4_";
public static string AppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "WeeXnes");
- public static string KeyListPath = AppDataPath + "\\" + "Keys";
- public static string RpcListPath = AppDataPath + "\\" + "RPC";
+ public static string DefaultKeyListPath = AppDataPath + "\\" + "Keys";
+ public static string DefaultRpcListPath = AppDataPath + "\\" + "RPC";
+ public static string KeyListPath = DefaultKeyListPath;
+ public static string RpcListPath = DefaultRpcListPath;
+ public static bool KeyCustomPath = false;
+ public static bool RpcCustomPath = false;
public static string SettingsFileName = "settings.ini";
- public static string version = "2.3";
+ public static string version = "2.4";
public static bool isRpcRunning = false;
public static string defaultRpcClient;
public static bool alwaysOnTop;
diff --git a/WeeXnes/MVVM/View/SettingView.xaml b/WeeXnes/MVVM/View/SettingView.xaml
index c68664b..32a5308 100644
--- a/WeeXnes/MVVM/View/SettingView.xaml
+++ b/WeeXnes/MVVM/View/SettingView.xaml
@@ -83,7 +83,7 @@
Name="tb_DefaultClientID"/>
+
+
+
+
+
@@ -112,22 +132,43 @@
Background="#22202f"
CornerRadius="10"
Margin="10,40,10,10">
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+