r20536 by jghali -

[scribus-commit]

Author: jghali
Date: Thu Nov  5 21:52:00 2015
New Revision: 20536

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20536
Log:
#13503: Crash when opening file

Modified:
    branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    branches/Version14x/Scribus/scribus/scribusdoc.cpp

Modified: branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20536&path=/branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(original)
+++ branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp	Thu Nov  5 21:52:00 2015
@@ -863,6 +863,7 @@
 			}
 			if (pg.tagName()=="HYPHEN")
 			{
+				m_Doc->createHyphenator();
 				QDomNode hyelm = pg.firstChild();
 				while (!hyelm.isNull())
 				{

Modified: branches/Version14x/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20536&path=/branches/Version14x/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusdoc.cpp	(original)
+++ branches/Version14x/Scribus/scribus/scribusdoc.cpp	Thu Nov  5 21:52:00 2015
@@ -641,7 +641,7 @@
 void ScribusDoc::createHyphenator()
 {
 	if (docHyphenator)
-		delete docHyphenator;
+		return;
 	docHyphenator = new Hyphenator(m_ScMW, this);
 	Q_CHECK_PTR(docHyphenator);
 }