r21202 by fschmid -

[scribus-commit]

Author: fschmid
Date: Sun Apr 17 07:24:26 2016
New Revision: 21202

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21202
Log:
Fixed Bug #11573: Opening SLA crashes scribus (sla maybe corrupted) 

Modified:
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21202&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	(original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp	Sun Apr 17 07:24:26 2016
@@ -6794,17 +6794,20 @@
 					else
 					{
 						PageItem* master = LinkID.value(eF.itemID);
-						item->asNoteFrame()->setMaster(master);
-						master->asTextFrame()->setNoteFrame(item->asNoteFrame());
+						if (master != NULL)
+						{
+							item->asNoteFrame()->setMaster(master);
+							master->asTextFrame()->setNoteFrame(item->asNoteFrame());
 						//FIX welding with note frame
-						PageItem::WeldingInfo wInf;
-						for (int i = 0 ; i < master->weldList.count(); i++)
-						{
-							wInf = master->weldList.at(i);
-							if (wInf.weldID == eF.myID)
+							PageItem::WeldingInfo wInf;
+							for (int i = 0 ; i < master->weldList.count(); i++)
 							{
-								master->weldList[i].weldItem = item;
-								break;
+								wInf = master->weldList.at(i);
+								if (wInf.weldID == eF.myID)
+								{
+									master->weldList[i].weldItem = item;
+									break;
+								}
 							}
 						}
 					}