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

[scribus-commit]

Author: jghali
Date: Wed Feb 26 19:48:49 2014
New Revision: 18848

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

Modified:
    branches/Version14x/Scribus/scribus/nodeeditpalette.cpp
    branches/Version14x/Scribus/scribus/scribusdoc.cpp

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

Modified: branches/Version14x/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18848&path=/branches/Version14x/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusdoc.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribusdoc.cpp Wed Feb 26 19:48:49 2014
@@ -11319,6 +11319,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