Fix the registration of the new config...

NexerqDev · May 22, 2016 · 01a82e0 · 01a82e0
1 parent 81a6bdf
commit 01a82e0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/WpfNexDirect/App.config b/WpfNexDirect/App.config
@@ -10,9 +10,6 @@
     </startup>
     <userSettings>
         <NexDirect.Properties.Settings>
-            <setting name="osuFolder" serializeAs="String">
-                <value />
-            </setting>
             <setting name="overlayMode" serializeAs="String">
                 <value>False</value>
             </setting>
@@ -28,6 +25,9 @@
             <setting name="launchOsu" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="osuFolder" serializeAs="String">
+                <value />
+            </setting>
         </NexDirect.Properties.Settings>
     </userSettings>
 </configuration>
diff --git a/WpfNexDirect/MainWindow.xaml.cs b/WpfNexDirect/MainWindow.xaml.cs
@@ -311,7 +311,7 @@ public void checkOrPromptSongsDir()
                 {
                     if (File.Exists(Path.Combine(dialog.FileName, "osu!.exe")))
                     {
-                        osuFolder = Path.Combine(dialog.FileName, "Songs");
+                        osuFolder = dialog.FileName;
                     }
                 }
                 else

diff --git a/WpfNexDirect/Properties/Settings.Designer.cs b/WpfNexDirect/Properties/Settings.Designer.cs
diff --git a/WpfNexDirect/Properties/Settings.settings b/WpfNexDirect/Properties/Settings.settings
@@ -2,9 +2,6 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="NexDirect.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
-    <Setting Name="osuFolder" Type="System.String" Scope="User">
-      <Value Profile="(Default)" />
-    </Setting>
     <Setting Name="overlayMode" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
@@ -20,5 +17,8 @@
     <Setting Name="launchOsu" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="osuFolder" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>
-Original file line number
+Diff line change
@@ Expand Up / @@ -311,7 +311,7 @@ public void checkOrPromptSongsDir() @@
                     {
                         if (File.Exists(Path.Combine(dialog.FileName, "osu!.exe")))
                         {
-                            osuFolder = Path.Combine(dialog.FileName, "Songs");
+                            osuFolder = dialog.FileName;
                         }
                     }
                     else
@@ Expand Down @@