r15094 by jghali - #9092 (2nd round): switching master pages while "Edit content" tool is active makes frames unclickable

[scribus-commit]

Revision: 15094
Author: jghali
Date: 2010-05-20T21:19:27.463123Z
Commit message: #9092 (2nd round): switching master pages while "Edit content" tool is active makes frames unclickable

Changeset: 
M  /branches/Version135/Scribus/scribus/masterpagepalette.cpp

Diffs:
Index: scribus/masterpagepalette.cpp
===================================================================
--- scribus/masterpagepalette.cpp	(revision 15093)
+++ scribus/masterpagepalette.cpp	(revision 15094)
@@ -413,6 +413,8 @@
 		deleteButton->setEnabled(true);
 	if (currentDoc->appMode == modeEditClip)
 		currentView->requestMode(submodeEndNodeEdit);
+	else if (currentDoc->appMode == modeEdit || currentDoc->appMode == modeEditGradientVectors)
+		currentView->requestMode(modeNormal);
 	currentView->showMasterPage(currentDoc->MasterNames[sMuster]);
 }