Fully working taskbar!

IT WORKS!

1 files changed, 10 insertions, 7 deletions

diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs
index a3baf42..6bb7cc5 100644
--- a/TimeHACK.Engine/WindowManager.cs
+++ b/TimeHACK.Engine/WindowManager.cs
@@ -10,7 +10,6 @@ namespace TimeHACK.Engine
     {
         public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection();
 
-
         public WinClassic startWin95(UserControl content, String title, Image icon, Boolean MaxButton, Boolean MinButton)
         {
             // Setup Window
@@ -54,14 +53,18 @@ namespace TimeHACK.Engine
 
             // Time for the taskbar
 
-            // Convert an image to an icon
-            Bitmap theBitmap = new Bitmap(icon, new Size(icon.Width, icon.Height));
-            IntPtr Hicon = theBitmap.GetHicon();// Get an Hicon for myBitmap.
-            Icon newIcon = Icon.FromHandle(Hicon);// Create a new icon from the handle.
+            // Convert an image to an icon (for the taskbar)
+            if (icon != null)
+            {
+                Bitmap theBitmap = new Bitmap(icon, new Size(icon.Width, icon.Height));
+                IntPtr Hicon = theBitmap.GetHicon(); // Get an Hicon for myBitmap.
+                Icon newIcon = Icon.FromHandle(Hicon); // Create a new icon from the handle.
+                app.Icon = newIcon;
+            }
 
+            // Set some values (for the taskbar)
             app.Tag = TaskBarController.AvalibleApplicationID;
-            app.Text = title;
-            app.Icon = newIcon;
+            app.Text = title;        
 
             // Show the app
             app.Show();