Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 20:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential issues in control panel.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Wox.Plugin.SystemPlugins/ControlPanel/ControlPanel.cs
View File

@@ -51,7 +51,7 @@ namespace Wox.Plugin.SystemPlugins.ControlPanel
foreach (ControlPanelItem item in controlPanelItems) 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); item.Icon.ToBitmap().Save(iconFolder + item.LocalizedString + fileType);
} }

7
Wox.Plugin.SystemPlugins/ControlPanel/ControlPanelList.cs
View File

@@ -298,7 +298,12 @@ namespace Wox.Plugin.SystemPlugins.ControlPanel
args = args.Remove(x); 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) private static bool IS_INTRESOURCE(IntPtr value)

5
Wox/Helper/FontHelper.cs
View File

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