xserver: Branch 'master' - 2 commits

[Dodji Seketeli]

 hw/kdrive/ephyr/ephyr.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit aaa50b64113b122aaebd46e3b78e3fb7a8d70500
Merge: 868e303... ddce48e...
Author: Dodji Seketeli <dodji at openedhand.com>
Date:   Tue Nov 6 16:25:40 2007 +0100

    resync with 'master'

commit 868e303630d8b84070c2f1fd8d6da2cef045b029
Author: Dodji Seketeli <dodji at openedhand.com>
Date:   Tue Nov 6 16:24:46 2007 +0100

    Xephyr: fix a crash when using xrandr twice
    
            * hw/kdrive/ephyr/ephyr.c:
              (ephyrScreenFini): don't forget to
              free shadowfb data (if necessary) upon server is reset.

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index f46a89d..52f5dcf 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -719,6 +719,10 @@ ephyrRestore (KdCardInfo *card)
 void
 ephyrScreenFini (KdScreenInfo *screen)
 {
+    EphyrScrPriv  *scrpriv = screen->driver;
+    if (scrpriv->shadow) {
+        KdShadowFbFree (screen, 0);
+    }
     xfree(screen->driver);
     screen->driver = NULL;
 }