diff options
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()); } |