Fix crash on theme search

Odotocodot · Odotocodot · commit fce3b3ae3d7e · 2025-01-18T13:18:48.000Z
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/ThemeSelector.cs b/Plugins/Flow.Launcher.Plugin.Sys/ThemeSelector.cs
@@ -26,8 +26,7 @@ public List<Result> Query(Query query)
                 LoadThemes();
             }
 
-            int keywordIndex = query.Search.IndexOf(Keyword, StringComparison.Ordinal);
-            string search = query.Search[(keywordIndex + Keyword.Length + 1)..];
+            string search = query.SecondToEndSearch;
 
             if (string.IsNullOrWhiteSpace(search))
             {
@@ -52,7 +51,7 @@ private void OnVisibilityChanged(object sender, VisibilityChangedEventArgs args)
         }
 
         private void LoadThemes() 
-            => themes = ThemeManager.Instance.LoadAvailableThemes().Select(Path.GetFileNameWithoutExtension);
+            => themes = ThemeManager.Instance.LoadAvailableThemes().Select(x => x.FileNameWithoutExtension);
 
         private static Result CreateThemeResult(string theme) => CreateThemeResult(theme, 0, null);
 

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ public List<Result> Query(Query query)`
`26`	`26`	`LoadThemes();`
`27`	`27`	`}`
`28`	`28`
`29`		`- int keywordIndex = query.Search.IndexOf(Keyword, StringComparison.Ordinal);`
`30`		`- string search = query.Search[(keywordIndex + Keyword.Length + 1)..];`
	`29`	`+ string search = query.SecondToEndSearch;`
`31`	`30`
`32`	`31`	`if (string.IsNullOrWhiteSpace(search))`
`33`	`32`	`{`
`@@ -52,7 +51,7 @@ private void OnVisibilityChanged(object sender, VisibilityChangedEventArgs args)`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`private void LoadThemes()`
`55`		`- => themes = ThemeManager.Instance.LoadAvailableThemes().Select(Path.GetFileNameWithoutExtension);`
	`54`	`+ => themes = ThemeManager.Instance.LoadAvailableThemes().Select(x => x.FileNameWithoutExtension);`
`56`	`55`
`57`	`56`	`private static Result CreateThemeResult(string theme) => CreateThemeResult(theme, 0, null);`
`58`	`57`