From c6cf5ac91f86eafc7b9644e9f26e443d35c66ff3 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sun, 15 May 2016 09:06:09 -0700
Subject: [PATCH] Avoid resetting global cursor if no global cursor is set see
 #17503

(cherry picked from commit 5819b9cbc59b678e8e4b1b2897b710d932bbf94f)
---
 src/gtk/cursor.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gtk/cursor.cpp b/src/gtk/cursor.cpp
index 64eb4423fb..52173de111 100644
--- a/src/gtk/cursor.cpp
+++ b/src/gtk/cursor.cpp
@@ -385,6 +385,9 @@ bool wxIsBusy()
 
 void wxSetCursor( const wxCursor& cursor )
 {
-    g_globalCursor = cursor;
-    SetGlobalCursor(cursor);
+    //if (cursor.IsOk() || g_globalCursor.IsOk())
+    {
+        g_globalCursor = cursor;
+        SetGlobalCursor(cursor);
+    }
 }