From 040869db5c5681ee1b89fb1893fbb076d5216d42 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 5 Nov 2009 00:42:01 +0000 Subject: [PATCH] Fix strange flipping of fade active state when undoing things. git-svn-id: svn://localhost/ardour2/branches/3.0@6018 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audioregion.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index a5c52ce671..e46f8ed3fd 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -587,7 +587,7 @@ AudioRegion::state (bool full) child->add_child_nocopy (_fade_in->get_state ()); } - child->add_property (X_("active"), _fade_in_disabled ? X_("no") : X_("yes")); + child->add_property (X_("active"), fade_in_active () ? X_("yes") : X_("no")); child = node.add_child (X_("FadeOut")); @@ -597,7 +597,7 @@ AudioRegion::state (bool full) child->add_child_nocopy (_fade_out->get_state ()); } - child->add_property (X_("active"), _fade_out_disabled ? X_("no") : X_("yes")); + child->add_property (X_("active"), fade_out_active () ? X_("yes") : X_("no")); } child = node.add_child ("Envelope"); @@ -715,7 +715,7 @@ AudioRegion::set_live_state (const XMLNode& node, int version, Change& what_chan if (string_is_affirmative (prop->value())) { set_fade_in_active (true); } else { - set_fade_in_active (true); + set_fade_in_active (false); } }