From f93226218c6caa34a5a3b3c83ae934fa67002cad Mon Sep 17 00:00:00 2001 From: Herp Derpinstine Date: Tue, 15 Oct 2024 01:07:12 -0600 Subject: [PATCH] Added Tilde to Disabled Melon Folder Check --- MelonLoader/Melons/MelonFolderHandler.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/MelonLoader/Melons/MelonFolderHandler.cs b/MelonLoader/Melons/MelonFolderHandler.cs index 49db6198..bd0c91d6 100644 --- a/MelonLoader/Melons/MelonFolderHandler.cs +++ b/MelonLoader/Melons/MelonFolderHandler.cs @@ -89,19 +89,21 @@ private static void LoadFolder(string path, } } + private static bool StartsOrEndsWith(string dirNameLower, string target) + => dirNameLower.StartsWith(target) + || dirNameLower.EndsWith(target); + private static bool IsUserLibsFolder(string dirNameLower) - => dirNameLower.StartsWith("userlibs") - || dirNameLower.EndsWith("userlibs"); + => StartsOrEndsWith(dirNameLower, "userlibs"); private static bool IsDisabledFolder(string path, out string dirNameLower) { string dirName = new DirectoryInfo(path).Name; dirNameLower = dirName.ToLowerInvariant(); - return dirNameLower.StartsWith("disabled") - || dirNameLower.EndsWith("disabled") - || dirNameLower.StartsWith("old") - || dirNameLower.EndsWith("old"); + return StartsOrEndsWith(dirNameLower, "disabled") + || StartsOrEndsWith(dirNameLower, "old") + || StartsOrEndsWith(dirNameLower, "~"); } private static void ProcessFolder(string path,