diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-08 11:23:34 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-08 11:23:34 +0000 |
| commit | 75d2bbcf0f39b9c85bc270728343f61dabebce2d (patch) | |
| tree | cc3c92e0383bc1ed885d25290167c46b1f9edb15 /xorg-server/hw/xfree86/common | |
| parent | 3e1ba549192a68801232c28a9c12defb59531654 (diff) | |
| download | vcxsrv-75d2bbcf0f39b9c85bc270728343f61dabebce2d.tar.gz vcxsrv-75d2bbcf0f39b9c85bc270728343f61dabebce2d.tar.bz2 vcxsrv-75d2bbcf0f39b9c85bc270728343f61dabebce2d.zip | |
Git update 8/12/2009
Diffstat (limited to 'xorg-server/hw/xfree86/common')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Config.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86xv.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c index 40f65bdbf..e1283f97f 100644 --- a/xorg-server/hw/xfree86/common/xf86Config.c +++ b/xorg-server/hw/xfree86/common/xf86Config.c @@ -1456,7 +1456,7 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) #ifdef CONFIG_HAL xf86Msg(X_INFO, "The server relies on HAL to provide the list of " "input devices.\n\tIf no devices become available, " - "reconfigure HAL or disable AllowEmptyInput.\n"); + "reconfigure HAL or disable AutoAddDevices.\n"); #else xf86Msg(X_INFO, "HAL is disabled and no input devices were configured.\n" "\tTry disabling AllowEmptyInput.\n"); diff --git a/xorg-server/hw/xfree86/common/xf86xv.c b/xorg-server/hw/xfree86/common/xf86xv.c index abbe03397..82216598b 100644 --- a/xorg-server/hw/xfree86/common/xf86xv.c +++ b/xorg-server/hw/xfree86/common/xf86xv.c @@ -1297,7 +1297,7 @@ xf86XVAdjustFrame(int index, int x, int y, int flags) for(i = pa->nPorts; i > 0; i--, pPort++) { pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr; - if(!pPriv->type && (pPriv->isOn == XV_ON)) { /* overlaid still/image */ + if(!pPriv->type && (pPriv->isOn != XV_OFF)) { /* overlaid still/image */ if(pPriv->pCompositeClip && pPriv->FreeCompositeClip) REGION_DESTROY(pScreen, pPriv->pCompositeClip); @@ -1311,7 +1311,7 @@ xf86XVAdjustFrame(int index, int x, int y, int flags) (pWin->visibility == VisibilityPartiallyObscured))) { xf86XVReputImage(pPriv); - } else { + } else if (pPriv->isOn == XV_ON) { (*pPriv->AdaptorRec->StopVideo)( pPriv->pScrn, pPriv->DevPriv.ptr, FALSE); xf86XVRemovePortFromWindow(pWin, pPriv); |