r20268 by jghali - #13253: Paragraph Effects cause crash changing "Char Syle" back to "No Style"

[scribus-commit]

Author: jghali
Date: Thu Jul 23 10:53:49 2015
New Revision: 20268

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20268
Log:
#13253: Paragraph Effects cause crash changing "Char Syle" back to "No Style"

Modified:
    trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp

Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20268&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp Thu Jul 23 10:53:49 2015
@@ -269,7 +269,7 @@
 	connect(numStart, SIGNAL(valueChanged(int)), this, SLOT(handleNumStart(int)), Qt::UniqueConnection);
 	connect(peOffset, SIGNAL(valueChanged(double)), this, SLOT(handlePEOffset(double)), Qt::UniqueConnection);
 	connect(peIndent, SIGNAL(toggled(bool)), this, SLOT(handlePEIndent(bool)), Qt::UniqueConnection);
-	connect(peCharStyleCombo, SIGNAL(activated(QString)), this, SLOT(handlePECharStyle(QString)), Qt::UniqueConnection);
+	connect(peCharStyleCombo, SIGNAL(newStyle(QString)), this, SLOT(handlePECharStyle(QString)), Qt::UniqueConnection);
 }
 
 void PropertyWidget_ParEffect::disconnectSignals()
@@ -285,7 +285,7 @@
 	disconnect(numStart, SIGNAL(valueChanged(int)), this, SLOT(handleNumStart(int)));
 	disconnect(peOffset, SIGNAL(valueChanged(double)), this, SLOT(handlePEOffset(double)));
 	disconnect(peIndent, SIGNAL(toggled(bool)), this, SLOT(handlePEIndent(bool)));
-	disconnect(peCharStyleCombo, SIGNAL(activated(QString)), this, SLOT(handlePECharStyle(QString)));
+	disconnect(peCharStyleCombo, SIGNAL(newStyle(QString)), this, SLOT(handlePECharStyle(QString)));
 }
 
 void PropertyWidget_ParEffect::configureWidgets(void)
@@ -521,8 +521,7 @@
 	if (!m_doc || !m_item)
 		return;
 	ParagraphStyle newStyle;
-	if (!name.isEmpty())
-		newStyle.setPeCharStyleName(name);
+	newStyle.setPeCharStyleName(name);
 	handleChanges(m_item, newStyle);
 }