fixes for 98% of all the warnings/errors reported by OS X gcc on tiger

[ardour.git] / gtk2_ardour / audio_region_editor.cc

diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index b0767604c95e3923452bf760e65c8c236bf6738e..e06e50f113558e363c312b2cb724890ce601a261 100644 (file)
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -96,10 +96,9 @@ AudioRegionEditor::AudioRegionEditor (Session* s, boost::shared_ptr<AudioRegion>
 
 AudioRegionEditor::~AudioRegionEditor ()
 {
-       pthread_cancel_one (_peak_amplitude_thread_handle);
        void* v;
-       int const r = pthread_join (_peak_amplitude_thread_handle, &v);
-       assert (r == 0);
+       pthread_cancel_one (_peak_amplitude_thread_handle);
+       pthread_join (_peak_amplitude_thread_handle, &v);
 }
 
 void