aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlempamo <[email protected]>2017-02-24 14:47:37 -0500
committerlempamo <[email protected]>2017-02-24 14:47:37 -0500
commitbb65020a6e8e7bb302e027254e1d6c2cde5d56da (patch)
treed6db2060fecc5e4126ec9c86d83b9d987063e240
parent0295ca9df724ef8823a5b63b2a37f5527289db84 (diff)
downloadshiftos_thereturn-bb65020a6e8e7bb302e027254e1d6c2cde5d56da.tar.gz
shiftos_thereturn-bb65020a6e8e7bb302e027254e1d6c2cde5d56da.tar.bz2
shiftos_thereturn-bb65020a6e8e7bb302e027254e1d6c2cde5d56da.zip
Fixed NRE
-rw-r--r--ShiftOS.WinForms/WinformsDesktop.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/ShiftOS.WinForms/WinformsDesktop.cs b/ShiftOS.WinForms/WinformsDesktop.cs
index 8ca7969..2bb2715 100644
--- a/ShiftOS.WinForms/WinformsDesktop.cs
+++ b/ShiftOS.WinForms/WinformsDesktop.cs
@@ -251,9 +251,9 @@ namespace ShiftOS.WinForms
}));
this.BackgroundImageLayout = GetImageLayout("desktopbackground");
desktoppanel.BackgroundImage = ((Bitmap)GetImage("desktoppanel"));
- ((Bitmap)desktoppanel.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1));
+ if (desktoppanel.BackgroundImage != null) ((Bitmap)desktoppanel.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1));
menuStrip1.BackgroundImage = GetImage("applauncher");
- ((Bitmap)menuStrip1.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1));
+ if (menuStrip1.BackgroundImage != null) ((Bitmap)menuStrip1.BackgroundImage).MakeTransparent(Color.FromArgb(1, 0, 1));
lbtime.ForeColor = LoadedSkin.DesktopPanelClockColor;
lbtime.Font = LoadedSkin.DesktopPanelClockFont;
if (desktoppanel.BackgroundImage == null)