diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2014-02-07 00:09:52 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2014-02-07 00:09:52 +0000 |
| commit | ef952dfa5366cb4c7a7109b63629ea02a7fc576d (patch) | |
| tree | 613c87704170f3581fe34b11df1b2ca26e69e718 /src/Fl_Menu_Window.cxx | |
| parent | 74aeae38cb3a4695542ec39f2432841a2567a007 (diff) | |
Fix crash when Fl_Window::flush() is called before show() (STR #3028).
The fix is twofold:
(1) if Fl_Window::flush() is called, this is ignored silently
(2) if Fl_Window::make_current() is called directly, but the window
is currently not shown(), then the program will be terminated
with an error message.
The latter is necessary because returning from make_current() would
leave the program in a state where it would expect to have a valid
drawing context.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10095 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Menu_Window.cxx')
| -rw-r--r-- | src/Fl_Menu_Window.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Fl_Menu_Window.cxx b/src/Fl_Menu_Window.cxx index 28e121d0a..02bee699e 100644 --- a/src/Fl_Menu_Window.cxx +++ b/src/Fl_Menu_Window.cxx @@ -54,6 +54,7 @@ void Fl_Menu_Window::show() { } void Fl_Menu_Window::flush() { + if (!shown()) return; #if HAVE_OVERLAY if (!fl_overlay_visual || !overlay()) {Fl_Single_Window::flush(); return;} Fl_X *myi = Fl_X::i(this); |