r18847 by jghali - #12095, second part: crash when editing object nodes

[scribus-commit]

Author: jghali
Date: Wed Feb 26 19:48:10 2014
New Revision: 18847

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18847
Log:
#12095, second part: crash when editing object nodes

Modified:
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/ui/nodeeditpalette.cpp

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18847&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Wed Feb 26 19:48:10 2014
@@ -16257,6 +16257,8 @@
 void NodeEditContext::resetControl(PageItem* currItem)
 {
 	ScribusDoc* Doc = currItem->doc();
+	if (ClRe < 0)
+		return;
 	UndoManager* undoManager = UndoManager::instance();
 	
 	// do no record anything else but the core reset points action

Modified: trunk/Scribus/scribus/ui/nodeeditpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18847&path=/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.cpp Wed Feb 26 19:48:10 2014
@@ -832,7 +832,7 @@
 	m_doc->nodeEdit.SegP2 = -1;
 	if (m_doc->m_Selection->count() > 0)
 		m_doc->m_Selection->itemAt(0)->update();
-	ResNode->setEnabled(true);
+	ResNode->setEnabled(false);
 	AddNode->setEnabled(true);
 	DeleteNode->setEnabled(true);
 	SymMove->setEnabled(false);