Fix shiftnet crash with custom cursors

1 files changed, 15 insertions, 9 deletions

diff --git a/ShiftOS.WinForms/Tools/ControlManager.cs b/ShiftOS.WinForms/Tools/ControlManager.cs
index 8eba773..1067c3f 100644
--- a/ShiftOS.WinForms/Tools/ControlManager.cs
+++ b/ShiftOS.WinForms/Tools/ControlManager.cs
@@ -135,19 +135,25 @@ namespace ShiftOS.WinForms.Tools
             }
         }
 
-
-        public static void SetupControl(Control ctrl)
+        public static void SetCursor(Control ctrl)
         {
+            if (!(ctrl is WebBrowser))
+            {
+                var mouse = SkinEngine.GetImage("mouse");
+                if (mouse == null)
+                    mouse = Properties.Resources.DefaultMouse;
 
-            var mouse = SkinEngine.GetImage("mouse");
-            if (mouse == null)
-                mouse = Properties.Resources.DefaultMouse;
+                var mBmp = new Bitmap(mouse);
+                var gfx = Graphics.FromImage(mBmp);
+                var handle = mBmp.GetHicon();
 
-            var mBmp = new Bitmap(mouse);
-            var gfx = Graphics.FromImage(mBmp);
-            var handle = mBmp.GetHicon();
+                ctrl.Cursor = new Cursor(handle);
+            }
+        }
 
-            ctrl.Cursor = new Cursor(handle);
+        public static void SetupControl(Control ctrl)
+        {
+            SetCursor(ctrl);
             if (!(ctrl is MenuStrip) && !(ctrl is ToolStrip) && !(ctrl is StatusStrip) && !(ctrl is ContextMenuStrip))
             {
                 string tag = "";