Skip to content

Commit 77fff6c

Browse files
Merge pull request #1521 from Flow-Launcher/Shortcut
[Dev] Fix clipboard shortcut error when clipboard is empty
2 parents 588ef4b + 4a6e298 commit 77fff6c

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,9 @@ private async void QueryResults()
622622
{
623623
_updateSource?.Cancel();
624624

625-
if (string.IsNullOrWhiteSpace(QueryText))
625+
var query = ConstructQuery(QueryText, Settings.CustomShortcuts, Settings.BuiltinShortcuts);
626+
627+
if (query == null) // shortcut expanded
626628
{
627629
Results.Clear();
628630
Results.Visbility = Visibility.Collapsed;
@@ -631,9 +633,6 @@ private async void QueryResults()
631633
return;
632634
}
633635

634-
var query = ConstructQuery(QueryText, Settings.CustomShortcuts, Settings.BuiltinShortcuts);
635-
636-
637636
_updateSource?.Dispose();
638637

639638
var currentUpdateSource = new CancellationTokenSource();
@@ -741,6 +740,11 @@ async Task QueryTask(PluginPair plugin)
741740

742741
private Query ConstructQuery(string queryText, IEnumerable<CustomShortcutModel> customShortcuts, IEnumerable<BuiltinShortcutModel> builtInShortcuts)
743742
{
743+
if (string.IsNullOrWhiteSpace(queryText))
744+
{
745+
return null;
746+
}
747+
744748
StringBuilder queryBuilder = new(queryText);
745749
StringBuilder queryBuilderTmp = new(queryText);
746750

0 commit comments

Comments
 (0)