Fix crash on double-click of show-audio button.

diff --git a/ChangeLog b/ChangeLog
index 286a6e8aa06b176448822543edcd23e5ead5e55f..158ea050308bbcb22e4d2b282cace91fc5a6d060 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2013-12-02  Carl Hetherington  <cth@carlh.net>
 
+       * Fix crash on double-click of "show audio" button (#278).
+
        * Version 1.40 released.
 
 2013-12-02  Carl Hetherington  <cth@carlh.net>

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 04823d1e6f12a0aa653a6c6a0f3a3c9ae57af29c..97372b962a7285368d2317d1d3be5c769d313eb4 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -119,17 +119,17 @@ AudioContent::set_audio_delay (int d)
        signal_changed (AudioContentProperty::AUDIO_DELAY);
 }
 
-void
+boost::signals2::connection
 AudioContent::analyse_audio (boost::function<void()> finished)
 {
        shared_ptr<const Film> film = _film.lock ();
-       if (!film) {
-               return;
-       }
+       assert (film);
        
        shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, dynamic_pointer_cast<AudioContent> (shared_from_this())));
-       job->Finished.connect (finished);
+       boost::signals2::connection c = job->Finished.connect (finished);
        JobManager::instance()->add (job);
+
+       return c;
 }
 
 boost::filesystem::path

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index b100d7abad18f4f83e5f724a92b8ca322a490d60..ca4a1f2348fea78b788632a38a6da5a058c091f1 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -58,7 +58,7 @@ public:
        virtual AudioMapping audio_mapping () const = 0;
        virtual void set_audio_mapping (AudioMapping) = 0;
 
-       void analyse_audio (boost::function<void()>);
+       boost::signals2::connection analyse_audio (boost::function<void()>);
        boost::filesystem::path audio_analysis_path () const;
 
        void set_audio_gain (float);

diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 78f3deab655b36eca6a956fc72cfb5b553b807e3..1bce22811c6b7c48e6543445e1ad53414da6509e 100644 (file)
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -87,7 +87,7 @@ void
 AudioDialog::set_content (shared_ptr<AudioContent> c)
 {
        _content_changed_connection.disconnect ();
-       
+
        _content = c;
 
        try_to_load_analysis ();
@@ -104,9 +104,9 @@ AudioDialog::try_to_load_analysis ()
        if (!IsShown ()) {
                return;
        }
-       
+
        if (!boost::filesystem::exists (_content->audio_analysis_path())) {
-               _content->analyse_audio (bind (&AudioDialog::analysis_finished, this));
+               _analysis_finished_connection = _content->analyse_audio (bind (&AudioDialog::analysis_finished, this));
                return;
        }
        

diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 8623192c4c25ec2f19aaf6bd08d16b0ebc50d18d..b4257057dd6c4a2741301510fa478ddd85911992 100644 (file)
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -47,4 +47,5 @@ private:
        wxCheckBox* _type_checkbox[AudioPoint::COUNT];
        wxSlider* _smoothing;
        boost::signals2::scoped_connection _content_changed_connection;
+       boost::signals2::scoped_connection _analysis_finished_connection;
 };