r22074 by jghali - #14872: Crash when linking frames which are already linked

[scribus-commit]

Author: jghali
Date: Tue Jun 20 16:24:25 2017
New Revision: 22074

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22074
Log:
#14872: Crash when linking frames which are already linked

Modified:
    trunk/Scribus/scribus/canvasmode_framelinks.cpp

Modified: trunk/Scribus/scribus/canvasmode_framelinks.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22074&path=/trunk/Scribus/scribus/canvasmode_framelinks.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_framelinks.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_framelinks.cpp	Tue Jun 20 16:24:25 2017
@@ -97,8 +97,8 @@
 				PageItem* item1 = m_doc->m_Selection->itemAt(i);
 				PageItem* item2 = m_doc->m_Selection->itemAt(i+1);
 				if ((item1 != NULL && item1->asTextFrame()) &&
-						(item2 != NULL && item2->asTextFrame()) &&
-						item2 != item1->nextInChain())
+				    (item2 != NULL && item2->asTextFrame()) &&
+				     item1->testLinkCandidate(item2))
 				{
 					item1->link(item2);
 				}