2 files changed, 7 insertions, 5 deletions
diff --git a/externals/grill/flext/source/flinternal.h b/externals/grill/flext/source/flinternal.h
index 82c3b0fe..d0d76eba 100644
--- a/externals/grill/flext/source/flinternal.h
+++ b/externals/grill/flext/source/flinternal.h
@@ -59,8 +59,8 @@ typedef t_perfroutine t_dspmethod;
 
 #define qelem_new clock_new
 #define qelem_free clock_free
-#define qelem_set clock_set
-#define qelem_front clock_set
+#define qelem_set clock_delay
+#define qelem_front clock_delay
 #define qelem_unset clock_unset
 
 #define CRITON() 
diff --git a/externals/grill/flext/source/fltimer.cpp b/externals/grill/flext/source/fltimer.cpp
index c317df45..294da438 100755
--- a/externals/grill/flext/source/fltimer.cpp
+++ b/externals/grill/flext/source/fltimer.cpp
@@ -162,9 +162,11 @@ bool flext::Timer::At(double tm,void *data,bool dopast)
     userdata = data;
     period = 0;
 #if FLEXT_SYS == FLEXT_SYS_PD 
-    const double ms = tm*1000.;
-    if(dopast || clock_gettimesince(ms) <= 0)
-        clock_set(clk,ms);
+    const double systm = clock_gettimesince(0);
+    double df = tm*1000.-systm;
+    if(dopast && df < 0) df = 0;
+    if(df >= 0)
+        clock_delay(clk,df);
 #elif FLEXT_SYS == FLEXT_SYS_MAX
     const double ms = tm*1000.;
     double cur;