[Libreoffice-commits] .: Branch 'libreoffice-3-4-2' - desktop/unx

Kohei Yoshida kohei at kemper.freedesktop.org
Wed Jul 13 17:52:18 PDT 2011


 desktop/unx/source/splashx.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8588ed1abda9973ac724e55adb38dadabddf6a05
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Jul 13 19:19:45 2011 +0200

    null the display pointer after closing the display, fixes fdo#37579
    
    Signed-off-by: Jan Holesovsky <kendy at suse.cz>
    Signed-off-by: Noel Power <nopower at novell.com>
    Signed-off-by: Kohei Yoshida <kyoshida at novell.com>

diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 711671f..4f5d4b2 100755
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -620,6 +620,7 @@ void splash_draw_progress( int progress )
 void splash_close_window()
 {
     XCloseDisplay( display );
+    display = NULL;
 #ifdef USE_LIBPNG
     png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
 #else


More information about the Libreoffice-commits mailing list