summaryrefslogtreecommitdiff
path: root/libs/ardour/audio_playlist.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-06-22 20:06:10 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-06-22 20:06:10 +0000
commit9687e8a6673f61c2b7167cb5c848e2adc5d82238 (patch)
tree1994e9d3d3db156418da5bef938851cf54702724 /libs/ardour/audio_playlist.cc
parent2801e91fe2f43bf83d0f657d1978fe00bf349fb4 (diff)
second half of "bomb out if playlist construction from XML fails"
git-svn-id: svn://localhost/ardour2/branches/3.0@9759 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_playlist.cc')
-rw-r--r--libs/ardour/audio_playlist.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 12b2e4062a..0c9fd4f314 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -109,7 +109,9 @@ AudioPlaylist::AudioPlaylist (Session& session, const XMLNode& node, bool hidden
add_property (_crossfades);
in_set_state++;
- set_state (node, Stateful::loading_state_version);
+ if (set_state (node, Stateful::loading_state_version)) {
+ throw failed_constructor();
+ }
in_set_state--;
}
@@ -728,7 +730,9 @@ AudioPlaylist::set_state (const XMLNode& node, int version)
in_set_state++;
- Playlist::set_state (node, version);
+ if (Playlist::set_state (node, version)) {
+ return -1;
+ }
freeze ();