diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-06 18:17:46 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-06 18:17:46 +0000 |
commit | e3ed1adadda0caec9b6e90d48c7756ea6cb20423 (patch) | |
tree | 4dcf506ea6ccd7bfa7ec818d0ee844bd377d70cf /libs/ardour/butler.cc | |
parent | e69aca28426dd17a0f82ea01c7c98e217b4fdcc3 (diff) |
(3.0 version of 2.0-ongoing) fix 100% CPU usage after killing JACK caused by faulty logic in butler thread main loop
git-svn-id: svn://localhost/ardour2/branches/3.0@6865 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/butler.cc')
-rw-r--r-- | libs/ardour/butler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc index addf6ddf27..571ac5f883 100644 --- a/libs/ardour/butler.cc +++ b/libs/ardour/butler.cc @@ -240,7 +240,7 @@ Butler::thread_work () } - if (i != dsl->end()) { + if (i != dsl->begin() && i != dsl->end()) { /* we didn't get to all the streams */ disk_work_outstanding = true; } @@ -294,7 +294,7 @@ Butler::thread_work () _session.request_stop (); } - if (i != dsl->end()) { + if (i != dsl->begin() && i != dsl->end()) { /* we didn't get to all the streams */ disk_work_outstanding = true; } |