r19357 by jghali - fix potential crash

scribus-commit scribus-commit at lists.scribus.net
Sat Jul 19 01:01:09 UTC 2014


Author: jghali
Date: Sat Jul 19 01:01:09 2014
New Revision: 19357

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19357
Log:
fix potential crash

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19357&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat Jul 19 01:01:09 2014
@@ -6581,7 +6581,7 @@
 			}
 		}
 		//disable text action which work only text frame in edit mode
-		if ((mode != modeEdit) || !currItem->isTextFrame())
+		if ((mode != modeEdit) || (!currItem) || !currItem->isTextFrame())
 			appModeHelper.enableTextActions(false);
 		int docSelectionCount = doc->m_Selection->count();
 		if (mode == modeDrawBezierLine)
@@ -10833,12 +10833,10 @@
 	QObject *q_xSpinBox = rootObject->findChild<QObject*>("xSpinBox");
 	QObject *q_ySpinBox = rootObject->findChild<QObject*>("ySpinBox");
 
-
 	connect(q_xSpinBox, SIGNAL(editingFinished()), this, SLOT(testQT_slot4()));
 	connect(q_ySpinBox, SIGNAL(valueChanged(int)), this, SLOT(testQT_slot3(int)));
 	connect(q_closeCheckBox, SIGNAL(clicked()), this, SLOT(testQT_slot4()));
 	qqview->show();
-
 }
 
 void ScribusMainWindow::testQT_slot1(QString s)




More information about the scribus-commit mailing list