From 0358002e72d1cfba22183773111856a7a5c32a5f Mon Sep 17 00:00:00 2001
From: Travis Nickles <nickles.travis@gmail.com>
Date: Thu, 16 Aug 2018 17:42:03 -0500
Subject: [PATCH] Remove some older unnecessary variables

---
 DS4Windows/DS4Control/ScpUtil.cs | 16 ----------------
 DS4Windows/DS4Forms/DS4Form.cs   |  7 -------
 2 files changed, 23 deletions(-)

diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
index 0bd2a07..a7e0a9c 100644
--- a/DS4Windows/DS4Control/ScpUtil.cs
+++ b/DS4Windows/DS4Control/ScpUtil.cs
@@ -231,9 +231,7 @@ namespace DS4Windows
         public static string appdatapath;
         public static bool firstRun = false;
         public static bool multisavespots = false;
-        public static bool oldappdatafail = false;
         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 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 };
@@ -342,20 +340,6 @@ namespace DS4Windows
                 SaveWhere(exepath);
             else if (File.Exists(appDataPpath + "\\Auto Profiles.xml"))
                 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")
                 && !File.Exists(appDataPpath + "\\Auto Profiles.xml"))
             {
diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs
index 2363e52..6f9f5e3 100644
--- a/DS4Windows/DS4Forms/DS4Form.cs
+++ b/DS4Windows/DS4Forms/DS4Form.cs
@@ -88,13 +88,6 @@ namespace DS4Windows
             {
                 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.SetCulture(UseLang);