[med-svn] [aghermann] 24/34: mw/settings_cb.cc: correctly order assignments before checks in tDesign_switch_cb()

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch master
in repository aghermann.

commit 49d097d8cddbbf607ca94796ea61ef02cf42afc7
Author: Andrei Zavada <hmmr at ra>
Date:   Sat Nov 16 01:35:01 2013 +0200

    mw/settings_cb.cc: correctly order assignments before checks in tDesign_switch_cb()
---
 upstream/src/aghermann/ui/mw/settings_cb.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/upstream/src/aghermann/ui/mw/settings_cb.cc b/upstream/src/aghermann/ui/mw/settings_cb.cc
index fbbb2c5..4ea202b 100644
--- a/upstream/src/aghermann/ui/mw/settings_cb.cc
+++ b/upstream/src/aghermann/ui/mw/settings_cb.cc
@@ -76,14 +76,19 @@ tDesign_switch_page_cb(
                      !ED.ED->swu_params.same_as( ED.swu_params_saved) ) {
                       // rescan tree
                         ED.do_rescan_tree(); // with populate
+
                 } else if ( ED.tl_height_saved != ED.tl_height ||
                             // recalculte mesurements layout as necessary
                             ED.tl_pph_saved    != ED.tl_pph )
                         ED.populate_1();
 
         } else {
+                ED.pagesize_item                      = ED.figure_pagesize_item();
+                ED.binsize_item                       = ED.figure_binsize_item();
+
                 ED.tl_pph_saved                       = ED.tl_pph;
                 ED.tl_height_saved                    = ED.tl_height;
+
                 ED.pagesize_item_saved                = ED.pagesize_item;
                 ED.binsize_item_saved                 = ED.binsize_item;
                 ED.af_dampen_window_type_saved        = ED.ED->af_dampen_window_type;
@@ -92,9 +97,6 @@ tDesign_switch_page_cb(
                 ED. mc_params_saved.make_same( ED.ED-> mc_params);
                 ED.swu_params_saved.make_same( ED.ED->swu_params);
 
-                ED.pagesize_item                      = ED.figure_pagesize_item();
-                ED.binsize_item                       = ED.figure_binsize_item();
-
                 ED.W_V1.up();
 
                 // colours are served specially elsewhere

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git