Merged with trunk R874.

[ardour.git] / libs / ardour / audioregion.cc

diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 07127b78c1cdc3f5568ac262b9643b5fcf78a497..362ab305dbeb9d968d8e66a77e829335c08c4d90 100644 (file)
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -271,7 +271,7 @@ AudioRegion::restore_state (StateManager::State& sstate)
        if (_fade_in_disabled != state->_fade_in_disabled) {
                if (_fade_in_disabled == 0 && state->_fade_in_disabled) {
                        set_fade_in_active (false);
-               } if (_fade_in_disabled && state->_fade_in_disabled == 0) {
+               } else if (_fade_in_disabled && state->_fade_in_disabled == 0) {
                        set_fade_in_active (true);
                }
                _fade_in_disabled = state->_fade_in_disabled;
@@ -280,7 +280,7 @@ AudioRegion::restore_state (StateManager::State& sstate)
        if (_fade_out_disabled != state->_fade_out_disabled) {
                if (_fade_out_disabled == 0 && state->_fade_out_disabled) {
                        set_fade_out_active (false);
-               } if (_fade_out_disabled && state->_fade_out_disabled == 0) {
+               } else if (_fade_out_disabled && state->_fade_out_disabled == 0) {
                        set_fade_out_active (true);
                }
                _fade_out_disabled = state->_fade_out_disabled;