diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-21 08:45:16 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-21 08:45:16 +0100 |
| commit | 6e90a0e707aa6d28622f654078f25066bef4dc80 (patch) | |
| tree | cc95d3e984b2fc4503b5fc8ae731518a8c34fe7c /xorg-server/present/present_screen.c | |
| parent | f75616ac3e99a6bb814803c823cb34533b9fc328 (diff) | |
| parent | bb953a87489963f63e65c797a1f2837382ff7808 (diff) | |
| download | vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.tar.gz vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.tar.bz2 vcxsrv-6e90a0e707aa6d28622f654078f25066bef4dc80.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa git update 21 nov 2013
Diffstat (limited to 'xorg-server/present/present_screen.c')
| -rw-r--r-- | xorg-server/present/present_screen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/present/present_screen.c b/xorg-server/present/present_screen.c index 0d659a16b..6df0c1d99 100644 --- a/xorg-server/present/present_screen.c +++ b/xorg-server/present/present_screen.c @@ -92,7 +92,7 @@ present_clear_window_flip(WindowPtr window) if (flip_pending && flip_pending->window == window) { assert (flip_pending->abort_flip); - flip_pending->window_destroyed = TRUE; + flip_pending->window = NULL; } if (screen_priv->flip_window == window) screen_priv->flip_window = NULL; |