libreoffice/desktop-null-display-crash.diff
Lars Vogdt e155d84725 Accepting request 87378 from LibreOffice:Unstable
- add more detailed categories to desktop files

- svx-globlmn-hrc-build-dep.diff: fix build dependency problem in svx
- apply libreoffice-poppler-0.17.0.patch only on openSUSE > 11.3;
  cpp/poppler-version.h is not included in older poppler packages

- desktop-null-display-crash.diff: fix crash on exit.

OBS-URL: https://build.opensuse.org/request/show/87378
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=23
2011-10-11 15:58:40 +00:00

23 lines
520 B
Diff

--- desktop/unx/source/splashx.c
+++ desktop/unx/source/splashx.c
@@ -612,6 +612,9 @@
// Draw the progress
void splash_draw_progress( int progress )
{
+ if (!display)
+ return;
+
// sanity
if ( progress < 0 )
progress = 0;
@@ -642,7 +645,8 @@
// Close the window & cleanup
void splash_close_window()
{
- XCloseDisplay( display );
+ if (display)
+ XCloseDisplay( display );
display = NULL;
#ifdef USE_LIBPNG
png_destroy_read_struct( &png_ptr, &info_ptr, NULL );