Fix potential issues in control panel.

This commit is contained in:
qianlifeng 2014-07-19 08:15:51 +08:00
parent 6d8244ba5c
commit f1697313c0
3 changed files with 15 additions and 5 deletions

View file

@ -51,7 +51,7 @@ namespace Wox.Plugin.SystemPlugins.ControlPanel
foreach (ControlPanelItem item in controlPanelItems)
{
if (!File.Exists(iconFolder + item.LocalizedString + fileType))
if (!File.Exists(iconFolder + item.LocalizedString + fileType) && item.Icon != null)
{
item.Icon.ToBitmap().Save(iconFolder + item.LocalizedString + fileType);
}
@ -101,7 +101,7 @@ namespace Wox.Plugin.SystemPlugins.ControlPanel
if (item.InfoTip != null && (item.Score = matcher.Evaluate(item.InfoTip).Score) > 0) return true;
if (item.LocalizedString != null && (item.Score = matcher.Evaluate(item.LocalizedString.Unidecode()).Score) > 0) return true;
return false;
}
}

View file

@ -298,7 +298,12 @@ namespace Wox.Plugin.SystemPlugins.ControlPanel
args = args.Remove(x);
}
return Convert.ToUInt32(args);
uint size;
if (uint.TryParse(args, out size))
{
return size;
}
return 0;
}
private static bool IS_INTRESOURCE(IntPtr value)

View file

@ -13,6 +13,8 @@ namespace Wox.Helper
static FontWeightConverter fontWeightConverter = new FontWeightConverter();
public static FontWeight GetFontWeightFromInvariantStringOrNormal(string value)
{
if (value == null) return FontWeights.Normal;
try
{
return (FontWeight) fontWeightConverter.ConvertFromInvariantString(value);
@ -24,7 +26,9 @@ namespace Wox.Helper
static FontStyleConverter fontStyleConverter = new FontStyleConverter();
public static FontStyle GetFontStyleFromInvariantStringOrNormal(string value)
{
{
if (value == null) return FontStyles.Normal;
try
{
return (FontStyle)fontStyleConverter.ConvertFromInvariantString(value);
@ -37,7 +41,8 @@ namespace Wox.Helper
static FontStretchConverter fontStretchConverter = new FontStretchConverter();
public static FontStretch GetFontStretchFromInvariantStringOrNormal(string value)
{
{
if (value == null) return FontStretches.Normal;
try
{
return (FontStretch)fontStretchConverter.ConvertFromInvariantString(value);