r20290 by craig - #13268, #13269: Fix Preferences duplicating list entries when pressing Defaults button

[scribus-commit]

Author: craig
Date: Wed Jul 29 20:36:15 2015
New Revision: 20290

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20290
Log:
#13268, #13269: Fix Preferences duplicating list entries when pressing Defaults button

Modified:
    trunk/Scribus/scribus/prefsmanager.cpp
    trunk/Scribus/scribus/ui/prefs_printer.cpp

Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20290&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Wed Jul 29 20:36:15 2015
@@ -199,6 +199,7 @@
 	appPrefs.guidesPrefs.marginColor = QColor(Qt::blue);
 	appPrefs.guidesPrefs.guideColor = QColor(Qt::darkBlue);
 	appPrefs.guidesPrefs.baselineGridColor = QColor(Qt::lightGray);
+	appPrefs.guidesPrefs.renderStackOrder.clear();
 	appPrefs.guidesPrefs.renderStackOrder << 0 << 1 << 2 << 3 << 4;
 	appPrefs.guidesPrefs.gridType = 0;
 	appPrefs.typoPrefs.valueSuperScript = 33;

Modified: trunk/Scribus/scribus/ui/prefs_printer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20290&path=/trunk/Scribus/scribus/ui/prefs_printer.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_printer.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_printer.cpp Wed Jul 29 20:36:15 2015
@@ -54,6 +54,7 @@
 	QString printerName;
 	QStringList printerNames = PrinterUtil::getPrinterNames();
 	int numPrinters = printerNames.count();
+	destinationComboBox->clear();
 	for( int i = 0; i < numPrinters; i++)
 	{
 		printerName = printerNames[i];