diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
| commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
| tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /libs/ardour/butler.cc | |
| parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
| parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'libs/ardour/butler.cc')
| -rw-r--r-- | libs/ardour/butler.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc index 747dfcd575..1fe1524618 100644 --- a/libs/ardour/butler.cc +++ b/libs/ardour/butler.cc @@ -238,7 +238,7 @@ Butler::thread_work () break; case Request::Quit: - pthread_exit_pbd (0); + return 0; /*NOTREACHED*/ break; @@ -372,8 +372,6 @@ restart: empty_pool_trash (); } - pthread_exit_pbd (0); - /*NOTREACHED*/ return (0); } @@ -457,6 +455,7 @@ Butler::empty_pool_trash () void Butler::drop_references () { + cerr << "Butler drops pool trash\n"; SessionEvent::pool->set_trash (0); } |