Xfbdev: Make sure screen gets re-enabled on RandR failure

This commit is contained in:
Keith Packard 2001-05-29 21:55:41 +00:00
parent 562925c439
commit a2bd75d15a

View File

@ -21,7 +21,7 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.14 2001/05/29 04:54:11 keithp Exp $ */
/* $XFree86: xc/programs/Xserver/hw/kdrive/fbdev/fbdev.c,v 1.15 2001/05/29 17:47:55 keithp Exp $ */
#include "fbdev.h"
@ -531,6 +531,8 @@ fbdevRandRSetConfig (ScreenPtr pScreen,
LayerDestroy (pScreen, pNewLayer);
scrpriv->rotation = oldrotation;
scrpriv->shadow = oldshadow;
if (wasEnabled)
KdEnableScreen (pScreen);
return FALSE;
}
WalkTree (pScreen, fbdevLayerRemove, (pointer) scrpriv->pLayer);