r18037 by fschmid - Handle the close button on the window frame the same way for all special edit modes.

[scribus-commit]

Author: fschmid
Date: Thu Jan  3 12:05:52 2013
New Revision: 18037

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18037
Log:
Handle the close button on the window frame the same way for all special edit modes.

Modified:
    trunk/Scribus/scribus/scribuswin.cpp

Modified: trunk/Scribus/scribus/scribuswin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18037&path=/trunk/Scribus/scribus/scribuswin.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuswin.cpp (original)
+++ trunk/Scribus/scribus/scribuswin.cpp Thu Jan  3 12:05:52 2013
@@ -118,6 +118,18 @@
 		ce->ignore();
 		return;
 	}
+	else if (m_Doc->inlineEditMode())
+	{
+		m_MainWindow->editInlineEnd();
+		ce->ignore();
+		return;
+	}
+	else if (m_Doc->masterPageMode())
+	{
+		m_MainWindow->manageMasterPagesEnd();
+		ce->ignore();
+		return;
+	}
 	else
 	{
 		if (m_Doc->isModified() && (m_Doc->viewCount == 1))