Ensure thread safety for _lastExplorerView in NavigateDialogPath method

Jack251970 · Jack251970 · commit b3ff92fd780e · 2025-04-18T18:13:59.000+08:00
diff --git a/Flow.Launcher.Infrastructure/QuickSwitch/QuickSwitch.cs b/Flow.Launcher.Infrastructure/QuickSwitch/QuickSwitch.cs
@@ -163,12 +163,15 @@ private static void NavigateDialogPath(Action action = null)
             object document = null;
             try
             {
-                if (_lastExplorerView != null)
+                lock (_lastExplorerViewLock)
                 {
-                    // Use dynamic here because using IWebBrower2.Document can cause exception here:
-                    // System.Runtime.InteropServices.InvalidOleVariantTypeException: 'Specified OLE variant is invalid.'
-                    dynamic explorerView = _lastExplorerView;
-                    document = explorerView.Document;
+                    if (_lastExplorerView != null)
+                    {
+                        // Use dynamic here because using IWebBrower2.Document can cause exception here:
+                        // System.Runtime.InteropServices.InvalidOleVariantTypeException: 'Specified OLE variant is invalid.'
+                        dynamic explorerView = _lastExplorerView;
+                        document = explorerView.Document;
+                    }
                 }
             }
             catch (COMException)

Original file line number	Diff line number	Diff line change
`@@ -163,12 +163,15 @@ private static void NavigateDialogPath(Action action = null)`
`163`	`163`	`object document = null;`
`164`	`164`	`try`
`165`	`165`	`{`
`166`		`- if (_lastExplorerView != null)`
	`166`	`+ lock (_lastExplorerViewLock)`
`167`	`167`	`{`
`168`		`- // Use dynamic here because using IWebBrower2.Document can cause exception here:`
`169`		`- // System.Runtime.InteropServices.InvalidOleVariantTypeException: 'Specified OLE variant is invalid.'`
`170`		`- dynamic explorerView = _lastExplorerView;`
`171`		`- document = explorerView.Document;`
	`168`	`+ if (_lastExplorerView != null)`
	`169`	`+ {`
	`170`	`+ // Use dynamic here because using IWebBrower2.Document can cause exception here:`
	`171`	`+ // System.Runtime.InteropServices.InvalidOleVariantTypeException: 'Specified OLE variant is invalid.'`
	`172`	`+ dynamic explorerView = _lastExplorerView;`
	`173`	`+ document = explorerView.Document;`
	`174`	`+ }`
`172`	`175`	`}`
`173`	`176`	`}`
`174`	`177`	`catch (COMException)`