diff --git a/present/present_screen.c b/present/present_screen.c index bfd30b8ba..6efe3b3a2 100644 --- a/present/present_screen.c +++ b/present/present_screen.c @@ -64,7 +64,8 @@ present_close_screen(ScreenPtr screen) { present_screen_priv_ptr screen_priv = present_screen_priv(screen); - screen_priv->flip_destroy(screen); + if (screen_priv->flip_destroy) + screen_priv->flip_destroy(screen); unwrap(screen_priv, screen, CloseScreen); (*screen->CloseScreen) (screen); diff --git a/present/present_wnmd.c b/present/present_wnmd.c index 68b135848..3f78f02a0 100644 --- a/present/present_wnmd.c +++ b/present/present_wnmd.c @@ -674,12 +674,6 @@ present_wnmd_abort_vblank(ScreenPtr screen, WindowPtr window, RRCrtcPtr crtc, ui } } -static void -present_wnmd_flip_destroy(ScreenPtr screen) -{ - /* Cleanup done on window destruction */ -} - static void present_wnmd_flush(WindowPtr window) { @@ -705,5 +699,4 @@ present_wnmd_init_mode_hooks(present_screen_priv_ptr screen_priv) screen_priv->re_execute = &present_wnmd_re_execute; screen_priv->abort_vblank = &present_wnmd_abort_vblank; - screen_priv->flip_destroy = &present_wnmd_flip_destroy; }