diff options
| author | David Robillard <d@drobilla.net> | 2008-01-10 22:22:29 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-10 22:22:29 +0000 |
| commit | 8a2e30816ee392b871c5918f769f68cc0196a893 (patch) | |
| tree | eb85739049c0adc6186eea635aaaf65ef03f038f /libs/ardour/audio_diskstream.cc | |
| parent | bb457bb960c5bd7ed538f9d31477293415739f68 (diff) | |
Merge with 2.0-ongoing R2883.
git-svn-id: svn://localhost/ardour2/trunk@2885 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_diskstream.cc')
| -rw-r--r-- | libs/ardour/audio_diskstream.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index bc4a352c45..c36c9de184 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -264,7 +264,7 @@ AudioDiskstream::use_new_playlist () { string newname; boost::shared_ptr<AudioPlaylist> playlist; - + if (!in_set_state && destructive()) { return 0; } @@ -1998,8 +1998,6 @@ AudioDiskstream::set_state (const XMLNode& node) up of the IO that owns this DS (::non_realtime_input_change()) */ - in_set_state = false; - return 0; } |