r18460 by jghali - #11720: Crash on color2csv

scribus-commit scribus-commit at lists.scribus.net
Fri Sep 6 18:26:39 UTC 2013


Author: jghali
Date: Fri Sep  6 18:26:39 2013
New Revision: 18460

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18460
Log:
#11720: Crash on color2csv

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18460&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Fri Sep  6 18:26:39 2013
@@ -9439,12 +9439,12 @@
 		dia->setExtension(f.suffix());
 		dia->setZipExtension(f.suffix() + ".gz");
 		dia->setSelection(defNa);
-		if (docom != NULL)
+		if (docom != NULL && dia->SaveZip != NULL)
 			dia->SaveZip->setChecked(*docom);
 	}
 	if (optionFlags & fdDirectoriesOnly)
 	{
-		if (docom != NULL)
+		if (docom != NULL && dia->SaveZip != NULL)
 			dia->SaveZip->setChecked(*docom);
 		if (doFont != NULL)
 			dia->WithFonts->setChecked(*doFont);
@@ -9465,7 +9465,7 @@
 		}
 		else
 		{
-			if (docom != NULL)
+			if (docom != NULL && dia->SaveZip != NULL)
 				*docom = dia->SaveZip->isChecked();
 			if (doFont != NULL)
 				*doFont = dia->WithFonts->isChecked();




More information about the scribus-commit mailing list