Skip to content

Commit 996addf

Browse files
committed
Remove debug check, add dupe check instead
1 parent 873df5e commit 996addf

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

RetroBar/App.xaml.cs

-4
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ private ShellManager SetupManagedShell()
5858
ShellLogger.Severity = LogSeverity.Debug;
5959
ShellLogger.Attach(new ConsoleLog());
6060

61-
FileLog fileLog = new FileLog(@"c:\users\johns\desktop\log.txt");
62-
fileLog.Open();
63-
ShellLogger.Attach(fileLog);
64-
6561
ShellConfig config = ShellManager.DefaultShellConfig;
6662

6763
config.AutoStartTasksService = false;

RetroBar/Properties/PublishProfiles/ReleaseProfile.pubxml

-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
1414
<PublishSingleFile>True</PublishSingleFile>
1515
<PublishReadyToRun>True</PublishReadyToRun>
1616
<PublishTrimmed>False</PublishTrimmed>
17-
<DefineConstants></DefineConstants>
1817
</PropertyGroup>
1918
</Project>

RetroBar/Utilities/ThemeManager.cs

+2-8
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.IO;
55
using System.Linq;
66
using System.Windows;
7-
using ManagedShell.Common.Logging;
87

98
namespace RetroBar.Utilities
109
{
@@ -72,22 +71,17 @@ public List<string> GetThemes()
7271

7372
// Because RetroBar is published as a single-file app, it gets extracted to a temp directory, so custom themes won't be there.
7473
// Get the executable path to find the custom themes directory when not a debug build.
75-
ShellLogger.Error("BeforeDebugCheck");
76-
#if !DEBUG
77-
ShellLogger.Error("AfterDebugCheck");
7874
string customThemeDir = Path.Combine(Path.GetDirectoryName(ExePath.GetExecutablePath()), THEME_FOLDER);
79-
ShellLogger.Error(customThemeDir);
8075

8176
if (Directory.Exists(customThemeDir))
8277
{
8378
foreach (string subStr in Directory.GetFiles(customThemeDir)
84-
.Where(s => Path.GetExtension(s).Contains(THEME_EXT)))
79+
.Where(s => Path.GetExtension(s).Contains(THEME_EXT) && !themes.Contains(Path.GetFileNameWithoutExtension(s))))
8580
{
8681
themes.Add(Path.GetFileNameWithoutExtension(subStr));
8782
}
8883
}
89-
#endif
90-
84+
9185
return themes;
9286
}
9387

0 commit comments

Comments
 (0)