Skip to content

Commit bf44637

Browse files
committed
revert context menu early exit when history result
1 parent 657e6ae commit bf44637

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,17 +429,16 @@ 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-
436432
// For query mode, we load context menu
437433
if (QueryResultsSelected())
438434
{
439435
// When switch to ContextMenu from QueryResults, but no item being chosen, should do nothing
440436
// i.e. Shift+Enter/Ctrl+O right after Alt + Space should do nothing
441-
if (SelectedResults.SelectedItem?.Result != null)
437+
if (SelectedResults.SelectedItem?.Result != null &&
438+
!string.IsNullOrEmpty(SelectedResults.SelectedItem.Result.PluginID)) // Do not show context menu for history results
439+
{
442440
SelectedResults = ContextMenu;
441+
}
443442
}
444443
else
445444
{
@@ -1261,7 +1260,8 @@ private void QueryContextMenu()
12611260

12621261
var selected = Results.SelectedItem?.Result;
12631262

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

0 commit comments

Comments
 (0)