prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into dev

Browse source
This commit is contained in:
bao-qian 2015-11-04 18:02:58 +00:00
commit f110dce520
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Wox.Core/Plugin/PluginManager.cs
View file

@ -152,7 +152,7 @@ namespace Wox.Core.Plugin
{ {
var customizedPluginConfig = UserSettingStorage.Instance. var customizedPluginConfig = UserSettingStorage.Instance.
CustomizedPluginConfigs.FirstOrDefault(o => o.ID == plugin.Metadata.ID); CustomizedPluginConfigs.FirstOrDefault(o => o.ID == plugin.Metadata.ID);
if (customizedPluginConfig != null && customizedPluginConfig.Disabled) return; if (customizedPluginConfig != null && customizedPluginConfig.Disabled) continue;
if (IsInstantQueryPlugin(plugin)) if (IsInstantQueryPlugin(plugin))
{ {
using (new Timeit($"Plugin {plugin.Metadata.Name} is executing instant search")) using (new Timeit($"Plugin {plugin.Metadata.Name} is executing instant search"))

2
Wox/MainWindow.xaml.cs
View file

@ -464,7 +464,7 @@ namespace Wox
Query(tbQuery.Text); Query(tbQuery.Text);
Dispatcher.DelayInvoke("ShowProgressbar", () => Dispatcher.DelayInvoke("ShowProgressbar", () =>
{ {
if (!queryHasReturn && !string.IsNullOrEmpty(lastQuery)) if (!queryHasReturn && !string.IsNullOrEmpty(tbQuery.Text) && tbQuery.Text != lastQuery)
{ {
StartProgress(); StartProgress();
} }