diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 6 | ||||
| -rw-r--r-- | libs/fst/vstwin.c | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 8ea786b268..b4399b03fa 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1013,10 +1013,8 @@ If you still wish to quit, please use the\n\n\ halt_connection.disconnect (); AudioEngine::instance()->stop (); #ifdef WINDOWS_VST_SUPPORT -#ifndef PLATFORM_WINDOWS fst_stop_threading(); #endif -#endif quit (); } @@ -2926,18 +2924,14 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name, } #ifdef WINDOWS_VST_SUPPORT -#ifndef PLATFORM_WINDOWS fst_stop_threading(); #endif -#endif flush_pending (); #ifdef WINDOWS_VST_SUPPORT -#ifndef PLATFORM_WINDOWS fst_start_threading(); #endif -#endif retval = 0; out: diff --git a/libs/fst/vstwin.c b/libs/fst/vstwin.c index 3c1cbcce8f..6537918a7f 100644 --- a/libs/fst/vstwin.c +++ b/libs/fst/vstwin.c @@ -320,20 +320,20 @@ fst_init (void* possible_hmodule) return 0; } -#ifndef PLATFORM_WINDOWS /* linux + wine */ void fst_start_threading(void) { +#ifndef PLATFORM_WINDOWS /* linux + wine */ if (idle_id == 0) { gui_quit = 0; idle_id = g_idle_add (g_idle_call, NULL); } -} #endif +} -#ifndef PLATFORM_WINDOWS /* linux + wine */ void fst_stop_threading(void) { +#ifndef PLATFORM_WINDOWS /* linux + wine */ if (idle_id != 0) { gui_quit = 1; PostQuitMessage (0); @@ -341,8 +341,8 @@ fst_stop_threading(void) { //g_source_remove(idle_id); idle_id = 0; } -} #endif +} void fst_exit (void) |