Remove debug check, add dupe check instead

dremin · Feb 25, 2021 · 996addf · 996addf
1 parent 873df5e
commit 996addf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 13 deletions.
diff --git a/RetroBar/App.xaml.cs b/RetroBar/App.xaml.cs
@@ -58,10 +58,6 @@ private ShellManager SetupManagedShell()
             ShellLogger.Severity = LogSeverity.Debug;
             ShellLogger.Attach(new ConsoleLog());
 
-            FileLog fileLog = new FileLog(@"c:\users\johns\desktop\log.txt");
-            fileLog.Open();
-            ShellLogger.Attach(fileLog);
-
             ShellConfig config = ShellManager.DefaultShellConfig;
 
             config.AutoStartTasksService = false;

diff --git a/RetroBar/Properties/PublishProfiles/ReleaseProfile.pubxml b/RetroBar/Properties/PublishProfiles/ReleaseProfile.pubxml
@@ -14,6 +14,5 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishSingleFile>True</PublishSingleFile>
     <PublishReadyToRun>True</PublishReadyToRun>
     <PublishTrimmed>False</PublishTrimmed>
-    <DefineConstants></DefineConstants>
   </PropertyGroup>
 </Project>
diff --git a/RetroBar/Utilities/ThemeManager.cs b/RetroBar/Utilities/ThemeManager.cs
@@ -4,7 +4,6 @@
 using System.IO;
 using System.Linq;
 using System.Windows;
-using ManagedShell.Common.Logging;
 
 namespace RetroBar.Utilities
 {
@@ -72,22 +71,17 @@ public List<string> GetThemes()
 
             // Because RetroBar is published as a single-file app, it gets extracted to a temp directory, so custom themes won't be there.
             // Get the executable path to find the custom themes directory when not a debug build.
-            ShellLogger.Error("BeforeDebugCheck");
-#if !DEBUG
-            ShellLogger.Error("AfterDebugCheck");
             string customThemeDir = Path.Combine(Path.GetDirectoryName(ExePath.GetExecutablePath()), THEME_FOLDER);
-            ShellLogger.Error(customThemeDir);
 
             if (Directory.Exists(customThemeDir))
             {
                 foreach (string subStr in Directory.GetFiles(customThemeDir)
-                    .Where(s => Path.GetExtension(s).Contains(THEME_EXT)))
+                    .Where(s => Path.GetExtension(s).Contains(THEME_EXT) && !themes.Contains(Path.GetFileNameWithoutExtension(s))))
                 {
                     themes.Add(Path.GetFileNameWithoutExtension(subStr));
                 }
             }
-#endif
-
+
             return themes;
         }