r21216 by jghali -

[scribus-commit]

Author: jghali
Date: Tue Apr 19 09:53:10 2016
New Revision: 21216

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21216
Log:
#13842 related: fix unit conversion issue in display preferences when user change unit before closing document setup/preferences

Modified:
    trunk/Scribus/scribus/ui/prefs_display.cpp

Modified: trunk/Scribus/scribus/ui/prefs_display.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21216&path=/trunk/Scribus/scribus/ui/prefs_display.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_display.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_display.cpp	Tue Apr 19 09:53:10 2016
@@ -98,6 +98,7 @@
 	scratchSpaceBottomSpinBox->setNewUnit(unitIndex);
 	pageGapHorizontalSpinBox->setNewUnit(unitIndex);
 	pageGapVerticalSpinBox->setNewUnit(unitIndex);
+	docUnitIndex = unitIndex;
 }
 
 void Prefs_Display::restoreDefaults(struct ApplicationPrefs *prefsData)
@@ -410,7 +411,8 @@
 	prefsData->guidesPrefs.showBleed=showBleedAreaCheckBox->isChecked();
 	prefsData->displayPrefs.showPageShadow=showPageShadowCheckBox->isChecked();
 	prefsData->displayPrefs.showVerifierWarningsOnCanvas=showVerifierWarningsOnCanvasCheckBox->isChecked();
-	double unitRatio = unitGetRatioFromIndex(docUnitIndex);
+
+	double unitRatio = unitGetRatioFromIndex(prefsData->docSetupPrefs.docUnitIndex);
 	prefsData->displayPrefs.scratch.setLeft(scratchSpaceLeftSpinBox->value() / unitRatio);
 	prefsData->displayPrefs.scratch.setRight(scratchSpaceRightSpinBox->value() / unitRatio);
 	prefsData->displayPrefs.scratch.setTop(scratchSpaceTopSpinBox->value() / unitRatio);