andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xfree86: cache dev->isMaster before freeing the device.

Browse Source
This commit is contained in:
Peter Hutterer 2008-10-09 11:29:11 +10:30
parent 05cdef18ca
commit 5e213fe102
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xfree86/common/xf86Xinput.c
View File

@ -611,6 +611,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
InputDriverPtr drv; InputDriverPtr drv;
IDevRec *idev; IDevRec *idev;
IDevPtr *it; IDevPtr *it;
Bool isMaster = pDev->isMaster;
if (pInfo) /* need to get these before RemoveDevice */ if (pInfo) /* need to get these before RemoveDevice */
{ {
@ -621,7 +622,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
OsBlockSignals(); OsBlockSignals();
RemoveDevice(pDev); RemoveDevice(pDev);
if (!pDev->isMaster) if (!isMaster)
{ {
if(drv->UnInit) if(drv->UnInit)
drv->UnInit(drv, pInfo, 0); drv->UnInit(drv, pInfo, 0);