fix inadvertent breakage in ardev and friends caused by extension to LD_LIBRARY_PATH...

[ardour.git] / gtk2_ardour / editor_audio_import.cc

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 3cb2d378c219dff0599a0559764f7fda4b1352ac..da70df5c15a71c2e3ead386b9e43a85fb728f997 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -159,7 +159,6 @@ Editor::check_whether_and_how_to_import(string path, bool all_or_nothing)
 {
        string wave_name (Glib::path_get_basename(path));
 
-       SourceMap all_sources = _session->get_sources();
        bool already_exists = false;
        uint32_t existing;
 
@@ -633,7 +632,7 @@ Editor::embed_sndfiles (vector<string> paths, bool multifile,
                                goto out;
                        }
 
-                       ARDOUR_UI::instance()->flush_pending ();
+                       gtk_main_iteration();
                }
        }
 
@@ -962,7 +961,5 @@ void *
 Editor::import_thread ()
 {
        _session->import_files (import_status);
-       pthread_exit_pbd (0);
-       /*NOTREACHED*/
        return 0;
 }