From 57277a01d685b0e29a79e5d74a1465a2ceb23ef9 Mon Sep 17 00:00:00 2001
From: Michael <Michael@some.where>
Date: Sat, 6 May 2017 09:44:47 -0400
Subject: Most of TriWrite is implemented.

---
 ShiftOS.WinForms/Applications/Skin Loader.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'ShiftOS.WinForms/Applications/Skin Loader.cs')

diff --git a/ShiftOS.WinForms/Applications/Skin Loader.cs b/ShiftOS.WinForms/Applications/Skin Loader.cs
index f9857b7..90b05a1 100644
--- a/ShiftOS.WinForms/Applications/Skin Loader.cs	
+++ b/ShiftOS.WinForms/Applications/Skin Loader.cs	
@@ -65,8 +65,11 @@ namespace ShiftOS.WinForms.Applications
 
         public void SetupUI()
         {
-            SetupDesktop();
-            Setup();
+            if (LoadedSkin != null)
+            {
+                SetupDesktop();
+                Setup();
+            }
         }
 
         public void SetupDesktop()
@@ -78,7 +81,7 @@ namespace ShiftOS.WinForms.Applications
 
             //upgrades
 
-            if (SaveSystem.CurrentSave != null)
+            if (SaveSystem.CurrentSave != null && LoadedSkin != null)
             {
                 desktoppanel.Visible = ShiftoriumFrontend.UpgradeInstalled("desktop");
                 lbtime.Visible = ShiftoriumFrontend.UpgradeInstalled("desktop_clock_widget");
-- 
cgit v1.2.3