Fix Lock misuses on SettingsPage

neon-nyan · neon-nyan · commit 43b3a17398ff · 2025-05-12T22:59:57.000+07:00
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml.cs
@@ -2181,7 +2181,7 @@ private bool PerformSearch(string query)
                 return false;
             }
 
-            lock (_highlightLock)
+            using (_highlightLock.EnterScope())
             {
                 SettingsSearchBringIntoViewAndHighlight(firstControl);
                 _highlightCurrentIndex = 0;
@@ -2259,7 +2259,7 @@ private void SettingsSearchBox_OnLosingFocus(UIElement sender, LosingFocusEventA
 
         private void SettingsSearchBoxFindSelectNext(object? sender, RoutedEventArgs? e)
         {
-            lock (_highlightLock)
+            using (_highlightLock.EnterScope())
             {
                 if (_highlightedControls.Count == 0)
                 {
@@ -2280,7 +2280,7 @@ private void SettingsSearchBoxFindSelectNext(object? sender, RoutedEventArgs? e)
 
         private void SettingsSearchBoxFindSelectPrevious(object? sender, RoutedEventArgs? e)
         {
-            lock (_highlightLock)
+            using (_highlightLock.EnterScope())
             {
                 if (_highlightedControls.Count == 0)
                 {

Original file line number	Diff line number	Diff line change
`@@ -2181,7 +2181,7 @@ private bool PerformSearch(string query)`
`2181`	`2181`	`return false;`
`2182`	`2182`	`}`
`2183`	`2183`
`2184`		`- lock (_highlightLock)`
	`2184`	`+ using (_highlightLock.EnterScope())`
`2185`	`2185`	`{`
`2186`	`2186`	`SettingsSearchBringIntoViewAndHighlight(firstControl);`
`2187`	`2187`	`_highlightCurrentIndex = 0;`
`@@ -2259,7 +2259,7 @@ private void SettingsSearchBox_OnLosingFocus(UIElement sender, LosingFocusEventA`
`2259`	`2259`
`2260`	`2260`	`private void SettingsSearchBoxFindSelectNext(object? sender, RoutedEventArgs? e)`
`2261`	`2261`	`{`
`2262`		`- lock (_highlightLock)`
	`2262`	`+ using (_highlightLock.EnterScope())`
`2263`	`2263`	`{`
`2264`	`2264`	`if (_highlightedControls.Count == 0)`
`2265`	`2265`	`{`
`@@ -2280,7 +2280,7 @@ private void SettingsSearchBoxFindSelectNext(object? sender, RoutedEventArgs? e)`
`2280`	`2280`
`2281`	`2281`	`private void SettingsSearchBoxFindSelectPrevious(object? sender, RoutedEventArgs? e)`
`2282`	`2282`	`{`
`2283`		`- lock (_highlightLock)`
	`2283`	`+ using (_highlightLock.EnterScope())`
`2284`	`2284`	`{`
`2285`	`2285`	`if (_highlightedControls.Count == 0)`
`2286`	`2286`	`{`