r18844 by jghali - #12095: Crash when editing object nodes

[scribus-commit]

Author: jghali
Date: Tue Feb 25 21:42:19 2014
New Revision: 18844

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18844
Log:
#12095: 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=18844&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Tue Feb 25 21:42:19 2014
@@ -16201,7 +16201,7 @@
 void NodeEditContext::reset1Control(PageItem* currItem)
 {
 	ScribusDoc* Doc = currItem->doc();
-	if (ClRe % 2 == 0)
+	if ((ClRe < 0) || (ClRe % 2 == 0))
 		return;
 	UndoManager* undoManager = UndoManager::instance();
 

Modified: trunk/Scribus/scribus/ui/nodeeditpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18844&path=/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.cpp Tue Feb 25 21:42:19 2014
@@ -810,7 +810,7 @@
 		m_doc->m_Selection->itemAt(0)->update();
 	SymMove->setEnabled(true);
 	AsymMove->setEnabled(true);
-	Res1Node->setEnabled(true);
+	Res1Node->setEnabled(false);
 	ResNode->setEnabled(false);
 	AddNode->setEnabled(false);
 	DeleteNode->setEnabled(false);