X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_cursor.c;h=66ed155f087ef7ca8307d3baf7576fa854b12f6a;hb=ce2e5aba172eb85cda2b4f047bdcf9f54d019fd7;hp=5542a2d45e6d68f10645b6f0682539052f35bda5;hpb=7110b3c08fb65671279c5b643134c335a5200d5e;p=freeglut

diff --git a/src/freeglut_cursor.c b/src/freeglut_cursor.c
index 5542a2d..66ed155 100644
--- a/src/freeglut_cursor.c
+++ b/src/freeglut_cursor.c
@@ -147,13 +147,13 @@ void fgSetCursor ( SFG_Window *window, int cursorID )
             }
         }
 
-        if ( cursorIDToUse == GLUT_CURSOR_INHERIT )
+        if ( cursorIDToUse == GLUT_CURSOR_INHERIT ) {
             XUndefineCursor( fgDisplay.Display, window->Window.Handle );
-        if ( ( cursorIDToUse != GLUT_CURSOR_NONE ) && ( cursor == None ) )
+        } else if ( cursor != None ) {
+            XDefineCursor( fgDisplay.Display, window->Window.Handle, cursor );
+        } else if ( cursorIDToUse != GLUT_CURSOR_NONE ) {
             fgError( "Failed to create cursor" );
-        else
-            XDefineCursor( fgDisplay.Display,
-                           window->Window.Handle, cursor );
+        }
     }
 
 #elif TARGET_HOST_WIN32 || TARGET_HOST_WINCE