summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2008-10-19 20:15:32 +0000
committerMatthias Melcher <fltk@matthiasm.com>2008-10-19 20:15:32 +0000
commit0490b303831869c12c84d61025aab1bf2d1f1414 (patch)
tree8d8da068d0c54a3e1bf333eb6e281ca3f0117e97 /src
parentf3180baff0cf3958e4eef70a634def5d46ec2244 (diff)
Fixed adding an idle handler during a draw() call (STR #1950)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6473 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/Fl.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx
index 57d8cf778..0b62f4c4e 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -381,6 +381,8 @@ double Fl::wait(double time_to_wait) {
if (idle) time_to_wait = 0.0;
}
flush();
+ if (idle && !in_idle) // 'idle' may have been set within flush()
+ time_to_wait = 0.0;
return fl_wait(time_to_wait);
#else
@@ -427,6 +429,8 @@ double Fl::wait(double time_to_wait) {
} else {
// do flush first so that user sees the display:
flush();
+ if (idle && !in_idle) // 'idle' may have been set within flush()
+ time_to_wait = 0.0;
return fl_wait(time_to_wait);
}
#endif