Remove some older unnecessary variables

This commit is contained in:
Travis Nickles 2018-08-16 17:42:03 -05:00
parent b5c205f184
commit 0358002e72
2 changed files with 0 additions and 23 deletions

View File

@ -231,9 +231,7 @@ namespace DS4Windows
public static string appdatapath; public static string appdatapath;
public static bool firstRun = false; public static bool firstRun = false;
public static bool multisavespots = false; public static bool multisavespots = false;
public static bool oldappdatafail = false;
public static string appDataPpath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\DS4Windows"; public static string appDataPpath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\DS4Windows";
public static string oldappdatapath = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\DS4Tool";
public static bool runHotPlug = false; public static bool runHotPlug = false;
public const int XINPUT_UNPLUG_SETTLE_TIME = 250; // Inhibit races that occur with the asynchronous teardown of ScpVBus -> X360 driver instance. public const int XINPUT_UNPLUG_SETTLE_TIME = 250; // Inhibit races that occur with the asynchronous teardown of ScpVBus -> X360 driver instance.
public static string[] tempprofilename = new string[5] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty }; public static string[] tempprofilename = new string[5] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty };
@ -342,20 +340,6 @@ namespace DS4Windows
SaveWhere(exepath); SaveWhere(exepath);
else if (File.Exists(appDataPpath + "\\Auto Profiles.xml")) else if (File.Exists(appDataPpath + "\\Auto Profiles.xml"))
SaveWhere(appDataPpath); SaveWhere(appDataPpath);
else if (File.Exists(oldappdatapath + "\\Auto Profiles.xml"))
{
try
{
if (Directory.Exists(appDataPpath))
Directory.Move(appDataPpath, Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\DS4Windows Old");
Directory.Move(oldappdatapath, appDataPpath);
SaveWhere(appDataPpath);
}
catch
{
Global.oldappdatafail = true;
}
}
else if (!File.Exists(exepath + "\\Auto Profiles.xml") else if (!File.Exists(exepath + "\\Auto Profiles.xml")
&& !File.Exists(appDataPpath + "\\Auto Profiles.xml")) && !File.Exists(appDataPpath + "\\Auto Profiles.xml"))
{ {

View File

@ -88,13 +88,6 @@ namespace DS4Windows
{ {
new SaveWhere(Global.multisavespots).ShowDialog(); new SaveWhere(Global.multisavespots).ShowDialog();
} }
else if (Global.oldappdatafail)
{
MessageBox.Show(Properties.Resources.CannotMoveFiles, "DS4Windows");
Process.Start("explorer.exe", @"/select, " + appDataPpath);
Close();
return;
}
Global.Load(); Global.Load();
Global.SetCulture(UseLang); Global.SetCulture(UseLang);