Merge branch 'master' into dev

This commit is contained in:
bao-qian
2016-07-27 19:58:37 +01:00
38 changed files with 281 additions and 350 deletions

View File

@@ -59,7 +59,7 @@ namespace Wox.Core.Resource
// Exception of FindResource can't be cathed if global exception handle is set
var isBlur = Application.Current.TryFindResource("ThemeBlurEnabled");
if (isBlur is bool)
if (isBlur is bool && Environment.OSVersion.Version >= new Version(6, 2))
{
SetBlurForWindow(Application.Current.MainWindow, (bool)isBlur);
}