Skip to content

Commit 4ddb164

Browse files
committed
adjusted context menu call to exit early when history result selected
1 parent 5c241d7 commit 4ddb164

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -429,16 +429,17 @@ private void LoadContextMenu()
429429
return;
430430
}
431431

432+
// Do not show context menu for history results, they will have no PluginID set.
433+
if (string.IsNullOrEmpty(SelectedResults.SelectedItem?.Result?.PluginID))
434+
return;
435+
432436
// For query mode, we load context menu
433437
if (QueryResultsSelected())
434438
{
435439
// When switch to ContextMenu from QueryResults, but no item being chosen, should do nothing
436440
// i.e. Shift+Enter/Ctrl+O right after Alt + Space should do nothing
437-
if (SelectedResults.SelectedItem?.Result != null &&
438-
!string.IsNullOrEmpty(SelectedResults.SelectedItem.Result.PluginID)) // Do not show context menu for history items
439-
{
441+
if (SelectedResults.SelectedItem?.Result != null)
440442
SelectedResults = ContextMenu;
441-
}
442443
}
443444
else
444445
{
@@ -1260,8 +1261,7 @@ private void QueryContextMenu()
12601261

12611262
var selected = Results.SelectedItem?.Result;
12621263

1263-
if (selected != null && // SelectedItem returns null if selection is empty.
1264-
!string.IsNullOrEmpty(selected.PluginID)) // SelectedItem must have a valid PluginID
1264+
if (selected != null) // SelectedItem returns null if selection is empty.
12651265
{
12661266
List<Result> results = PluginManager.GetContextMenusForPlugin(selected);
12671267
results.Add(ContextMenuTopMost(selected));

0 commit comments

Comments
 (0)