Minor precaution added to ConfigManager. Deleted unintended English r…

…esource file.
cyanfish · Aug 17, 2013 · 86b5287 · 86b5287
1 parent 8798ae4
commit 86b5287
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 209 deletions.
diff --git a/NAPS2/Config/ConfigManager.cs b/NAPS2/Config/ConfigManager.cs
@@ -62,7 +62,7 @@ public virtual void Load()
         {
             config = null;
             TryLoadConfig(primaryConfigPath);
-            if (config == null)
+            if (config == null && secondaryConfigPath != null)
             {
                 TryLoadConfig(secondaryConfigPath);
             }

diff --git a/NAPS2/NAPS2.csproj b/NAPS2/NAPS2.csproj
@@ -318,9 +318,6 @@
     <EmbeddedResource Include="WinForms\FEditScanSettings.de.resx">
       <DependentUpon>FEditScanSettings.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="WinForms\FEditScanSettings.en.resx">
-      <DependentUpon>FEditScanSettings.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="WinForms\FEditScanSettings.es.resx">
       <DependentUpon>FEditScanSettings.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/NAPS2/WinForms/FEditScanSettings.en.resx b/NAPS2/WinForms/FEditScanSettings.en.resx