r16402 by jghali - fix "Apply" style action being duplicated in style manager popup menu in some situations (after text frame duplication...)

scribus-commit scribus-commit at lists.scribus.net
Sat Feb 26 00:10:19 CET 2011


Author: jghali
Date: Fri Feb 25 23:10:19 2011
New Revision: 16402

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16402
Log:
fix "Apply" style action being duplicated in style manager popup menu in some situations (after text frame duplication...)

Modified:
    branches/Version135/Scribus/scribus/stylemanager.cpp

Modified: branches/Version135/Scribus/scribus/stylemanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16402&path=/branches/Version135/Scribus/scribus/stylemanager.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/stylemanager.cpp (original)
+++ branches/Version135/Scribus/scribus/stylemanager.cpp Fri Feb 25 23:10:19 2011
@@ -205,7 +205,11 @@
 
 	// clear the style list and reload from new doc
 	styleView->clear();
-	m_selectedStyleAction = 0;
+	if (m_selectedStyleAction)
+	{
+		m_rightClickPopup->removeAction(m_selectedStyleAction);
+		m_selectedStyleAction = 0;
+	}
 	m_styleActions.clear();
 	for (int i = 0; i < m_items.count(); ++i)
 	{




More information about the scribus-commit mailing list