r15092 by jghali - #9092 : switching master pages while "Edit content" tool is active makes frames unclickable

[scribus-commit]

Revision: 15092
Author: jghali
Date: 2010-05-20T21:00:06.096841Z
Commit message: #9092 : switching master pages while "Edit content" tool is active makes frames unclickable

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

Diffs:
Index: scribus/scribusview.cpp
===================================================================
--- scribus/scribusview.cpp	(revision 15091)
+++ scribus/scribusview.cpp	(revision 15092)
@@ -2880,6 +2880,8 @@
 {
 	Deselect(false);
 	OldScale = m_canvas->scale();
+	if (!Doc->masterPageMode())
+		this->requestMode(modeNormal);
 	Doc->setMasterPageMode(true);
 	Doc->setCurrentPage(Doc->Pages->at(nr));
 	pageSelector->setEnabled(false);
@@ -2896,6 +2898,8 @@
 void ScribusView::hideMasterPage()
 {
 	Deselect(true);
+	if (Doc->masterPageMode())
+		this->requestMode(modeNormal);
 	Doc->setMasterPageMode(false);
 //	Doc->currentPage = Doc->Pages->at(0);
 	pageSelector->setEnabled(true);