Merge branch 'maint' into next

[flightgear.git] / src / Input / input.cxx

diff --git a/src/Input/input.cxx b/src/Input/input.cxx
index 912d8fc6135fcda50290f0c2544118286e7b1395..695a42610405ce9c44b3a9ae7a2626e0bc05369f 100644 (file)
--- a/src/Input/input.cxx
+++ b/src/Input/input.cxx
@@ -901,7 +901,8 @@ FGInput::_update_mouse ( double dt )
   if ( fgGetBool( "/sim/mouse/hide-cursor", true ) ) {
       if ( m.x != m.save_x || m.y != m.save_y ) {
           m.timeout = fgGetDouble( "/sim/mouse/cursor-timeout-sec", 10.0 );
-          fgSetMouseCursor(m.modes[mode].cursor);
+          if (fgGetMouseCursor() == MOUSE_CURSOR_NONE)
+              fgSetMouseCursor(m.modes[mode].cursor);
       } else {
           m.timeout -= dt;
           if ( m.timeout <= 0.0 ) {