summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-12-11 14:14:17 +0000
committerCarl Hetherington <carl@carlh.net>2011-12-11 14:14:17 +0000
commited360080d0e7a4505eb3e90f3f9946754f0c779b (patch)
treeb19fd8b3a4ec49c9f21eaee6ad0d93a91ab11809 /libs
parent692f857b83d6f09bbea9fbcca978f85a358aad9b (diff)
Sessions loaded from 2.X don't have a diskstream (yet)
in Track::set_state(); prevent a crash, at least; not 100% sure if the behaviour is right, though. git-svn-id: svn://localhost/ardour2/branches/3.0@10975 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/track.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index 8a4931d336..b17b8f523f 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -115,7 +115,9 @@ Track::set_state (const XMLNode& node, int version)
}
}
- _diskstream->playlist()->set_orig_track_id (id());
+ if (_diskstream) {
+ _diskstream->playlist()->set_orig_track_id (id());
+ }
/* set rec-enable control *AFTER* setting up diskstream, because it may
want to operate on the diskstream as it sets its own state