Merge branch 'master' into dotnet45

This commit is contained in:
bao-qian 2015-11-13 05:15:00 +00:00
commit e29f53a82d

View File

@ -257,6 +257,8 @@ namespace Wox.Core.Plugin
string msg = InternationalizationManager.Instance.GetTranslation("newActionKeywordsCannotBeEmpty");
throw new WoxPluginException(plugin.Metadata.Name, msg);
}
// do nothing if they are same
if (oldActionKeyword == newActionKeyword) return;
if (NonGlobalPlugins.ContainsKey(newActionKeyword))
{
string msg = InternationalizationManager.Instance.GetTranslation("newActionKeywordsHasBeenAssigned");