diff options
author | Ville Syrjala <syrjala@sci.fi> | 2011-01-24 01:06:42 +0200 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-01-27 14:22:02 +1000 |
commit | f4cb25c2ed832bf4cfcd4d25198fe5a895430fed (patch) | |
tree | 11df1a0b42de0516e532b902334a678ae61884c4 /hw | |
parent | e1547a9f1f6d7991219b7711f4cacc2852dbf88c (diff) |
xfree86/dga: Remove the ET_DGAEvent handler only if it was installed
Remove the handler only if it was installed. Also mark it as
uninstalled, otherwise it wouldn't get reinstalled after a
server reset.
Signed-off-by: Ville Syrjala <syrjala@sci.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/xfree86/common/xf86DGA.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 3cded85bf..c4b2d7d9a 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -250,9 +250,10 @@ DGACloseScreen(int i, ScreenPtr pScreen) { DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen); - if (XDGAEventBase) { + if (mieq_installed) { mieqSetHandler(ET_DGAEvent, NULL); - } + mieq_installed = 0; + } FreeMarkedVisuals(pScreen); |