r19365 by jghali - #12549: "Add Nodes" crashes Scribus in determined condition

[scribus-commit]

Author: jghali
Date: Wed Jul 23 11:55:46 2014
New Revision: 19365

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19365
Log:
#12549: "Add Nodes" crashes Scribus in determined condition

Modified:
    trunk/Scribus/scribus/appmodehelper.cpp
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19365&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Wed Jul 23 11:55:46 2014
@@ -34,6 +34,7 @@
 void AppModeHelper::setFrameEditMode(bool b)
 {
 	bool b2=!b;
+	(*scrActions)["insertFrame"]->setEnabled(b2);
 	(*scrActions)["toolsSelect"]->setEnabled(b2);
 	(*scrActions)["toolsRotate"]->setEnabled(b2);
 	(*scrActions)["toolsEditContents"]->setEnabled(b2);

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19365&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Wed Jul 23 11:55:46 2014
@@ -9569,8 +9569,10 @@
 	if (!HaveDoc)
 		return;
 
+	view->requestMode(modeNormal);
 	if (!doc->m_Selection->isEmpty())
 		view->Deselect(false);
+
 	InsertAFrame dia(this, doc);
 	if (dia.exec())
 	{