diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-29 13:43:56 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:45 -0400 |
| commit | 2562b4a2f0756350dd62f32673d6b99609262f86 (patch) | |
| tree | ae8d10e0f3ea2c4df5f64ec533fb656162c9cab4 /gtk2_ardour/mixer_ui.cc | |
| parent | fae3aee849e8d0cd0c5c0fa420fb7c4ceb9852df (diff) | |
handle old-version pane positions by ignoring them
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index b621a95283..764fc11c9e 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -265,23 +265,24 @@ Mixer_UI::Mixer_UI () XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings(); XMLProperty const * prop; + float fract; - if (!settings || ((prop = settings->property ("mixer-rhs-pane1-pos")) == 0)) { + if (!settings || ((prop = settings->property ("mixer-rhs-pane1-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { rhs_pane1.set_divider (0, 0.6f); } else { - rhs_pane1.set_divider (0, atof (prop->value())); + rhs_pane1.set_divider (0, fract); } - if (!settings || ((prop = settings->property ("mixer-rhs-pane2-pos")) == 0)) { + if (!settings || ((prop = settings->property ("mixer-rhs-pane2-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { rhs_pane2.set_divider (0, 0.7f); } else { - rhs_pane2.set_divider (0, atof (prop->value())); + rhs_pane2.set_divider (0, fract); } - if (!settings || ((prop = settings->property ("mixer-list-hpane-pos")) == 0)) { + if (!settings || ((prop = settings->property ("mixer-list-hpane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { list_hpane.set_divider (0, 0.2f); } else { - list_hpane.set_divider (0, atof (prop->value())); + list_hpane.set_divider (0, fract); } - if (!settings || ((prop = settings->property ("mixer-inner-pos")) == 0)) { + if (!settings || ((prop = settings->property ("mixer-inner-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { inner_pane.set_divider (0, 0.8f); } else { inner_pane.set_divider (0, atof (prop->value())); |