Merge branch 'master' into dev

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

View file

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

View file

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