r19492 by jghali - backport #12441 fix: Page > Delete... should not be clickable if the document has only 1 page

scribus-commit scribus-commit at lists.scribus.net
Sun Sep 7 16:16:39 UTC 2014


Author: jghali
Date: Sun Sep  7 16:16:39 2014
New Revision: 19492

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19492
Log:
backport #12441 fix: Page > Delete... should not be clickable if the document has only 1 page

Modified:
    branches/Version14x/Scribus/scribus/scribusdoc.cpp

Modified: branches/Version14x/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19492&path=/branches/Version14x/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribusdoc.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribusdoc.cpp Sun Sep  7 16:16:39 2014
@@ -153,6 +153,11 @@
 			return;
 		}
 		m_docChangeNeeded = true;
+	}
+
+	void setDocChangeNeeded(bool changeNeeded = true)
+	{
+		m_docChangeNeeded = changeNeeded;
 	}
 };
 
@@ -9373,10 +9378,12 @@
 	// Do not emit docChanged signal() unnecessarily
 	// Processing of that signal is slowwwwwww and
 	// DocUpdater will trigger it when necessary
-	if (!m_docUpdater->inUpdateSession())
-	{
-		emit docChanged();
-	}
+	if (m_docUpdater->inUpdateSession())
+	{
+		m_docUpdater->setDocChangeNeeded();
+		return;
+	}
+	emit docChanged();
 }
 
 void ScribusDoc::invalidateAll()




More information about the scribus-commit mailing list