diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-07-04 19:56:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-07-04 19:56:14 +0000 |
| commit | e35a84a32bedcb02396622b0b97dc0510aa11b91 (patch) | |
| tree | 206264418a8608430f4ef5a8fb6463d396a8764d /libs/ardour/track.cc | |
| parent | d762be4f735ef69345fb4e221d6c53e3282810b8 (diff) | |
Revert erroneous commit 12922 and replace with a better fix
(should fix #4947, #4963, #4987).
git-svn-id: svn://localhost/ardour2/branches/3.0@12986 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/track.cc')
| -rw-r--r-- | libs/ardour/track.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index 7f307f3edc..1c45460088 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -119,12 +119,12 @@ Track::state (bool full) int Track::set_state (const XMLNode& node, int version) { + if (Route::set_state (node, version)) { + return -1; + } + XMLNode* child; - /* Create the diskstream before calling Route::set_state, as MidiTrack - needs it if the track is muted (it ends up calling MidiTrack::get_channel_mask) - */ - if (version >= 3000) { if ((child = find_named_node (node, X_("Diskstream"))) != 0) { boost::shared_ptr<Diskstream> ds = diskstream_factory (*child); @@ -133,10 +133,6 @@ Track::set_state (const XMLNode& node, int version) } } - if (Route::set_state (node, version)) { - return -1; - } - if (_diskstream) { _diskstream->playlist()->set_orig_track_id (id()); } |