X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_spaceball.c;h=a2e70edb2a122fb5fd68ea6d9e61300939ab51f4;hb=ac26c64653954569627ad5413240cbd8453cd814;hp=154e52dce64fffee4addf476a6d327005dc8150f;hpb=5510bc295094794b4804bb97db4bb58ebba3c5b0;p=freeglut

diff --git a/src/freeglut_spaceball.c b/src/freeglut_spaceball.c
index 154e52d..a2e70ed 100644
--- a/src/freeglut_spaceball.c
+++ b/src/freeglut_spaceball.c
@@ -143,11 +143,13 @@ int fgIsSpaceballXEvent(const XEvent *xev)
 {
     spnav_event sev;
 
+    if(spnav_win != fgStructure.CurrentWindow) {
+        /* this will also initialize spaceball if needed (first call) */
+        fgSpaceballSetWindow(fgStructure.CurrentWindow);
+    }
+
     if(!sball_initialized) {
-        fgInitialiseSpaceball();
-        if(!sball_initialized) {
-            return 0;
-        }
+        return 0;
     }
 
     return spnav_x11_event(xev, &sev);