From 0f5b1a819205f78d990374cfe360a04a1bb8e1ed Mon Sep 17 00:00:00 2001
From: Ed Swartz <eswartz@austin.rr.com>
Date: Fri, 17 Apr 2015 15:50:11 -0500
Subject: [PATCH] Fix X11 M_relative case when missing XF86DGA

---
 panda/src/x11display/x11GraphicsWindow.cxx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/panda/src/x11display/x11GraphicsWindow.cxx b/panda/src/x11display/x11GraphicsWindow.cxx
index f1484522a1..c503bda1cc 100644
--- a/panda/src/x11display/x11GraphicsWindow.cxx
+++ b/panda/src/x11display/x11GraphicsWindow.cxx
@@ -747,6 +747,7 @@ set_properties_now(WindowProperties &properties) {
             XF86DGADirectVideo(_display, _screen, XF86DGADirectMouse);
 
             _properties.set_mouse_mode(WindowProperties::M_relative);
+            properties.clear_mouse_mode();
             _dga_mouse_enabled = true;
 
             // Get the real mouse position, so we can add/subtract
@@ -762,12 +763,7 @@ set_properties_now(WindowProperties &properties) {
           _dga_mouse_enabled = false;
         }
       }
-      else
 #endif
-      {
-        // can't change
-        properties.clear_mouse_mode();
-      }
       break;
 
     case WindowProperties::M_confined: