Merge remote-tracking branch 'remotes/origin/cairocanvas' into windows

[ardour.git] / gtk2_ardour / editor_timefx.cc

diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index ab836a28f4ebd8f9dbf1cc3104841f595354d839..e43dae9e2b4cf2efe3f6e4fed88f0453300ccb84 100644 (file)
--- a/gtk2_ardour/editor_timefx.cc
+++ b/gtk2_ardour/editor_timefx.cc
@@ -144,7 +144,8 @@ int
 Editor::time_fx (RegionList& regions, float val, bool pitching)
 {
        delete current_timefx;
-       current_timefx = 0;
+       current_timefx = new TimeFXDialog (*this, pitching);
+       current_timefx->regions = regions;
 
        /* See if we have any audio regions on our list */
        RegionList::iterator i = regions.begin ();
@@ -158,9 +159,6 @@ Editor::time_fx (RegionList& regions, float val, bool pitching)
                return 0;
        }
        
-       current_timefx = new TimeFXDialog (*this, pitching);
-       current_timefx->regions = regions;
-
        switch (current_timefx->run ()) {
        case RESPONSE_ACCEPT:
                break;
@@ -404,9 +402,12 @@ Editor::timefx_thread (void *arg)
            by the GUI ...
         */
 
+#ifdef WIN32
+       Sleep(2000);
+#else
         struct timespec t = { 2, 0 };
         nanosleep (&t, 0);
-
+#endif
        return 0;
 }