Mercurial > octave
changeset 26580:ab06235daf33 stable
Prevent the use of FLTK toolkit on Mac when running multithreaded (bug #54169).
* __init_fltk__.cc (PKG_ADD): Don't register fltk toolkit on Mac when GUI and
interpreter run in different threads.
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Sun, 24 Jun 2018 20:34:11 +0200 |
| parents | ae1542fb58ba |
| children | ada14ef3067f |
| files | libinterp/dldfcn/__init_fltk__.cc |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/dldfcn/__init_fltk__.cc Sat Jan 19 15:59:59 2019 +0100 +++ b/libinterp/dldfcn/__init_fltk__.cc Sun Jun 24 20:34:11 2018 +0200 @@ -30,7 +30,7 @@ */ -// PKG_ADD: if (__have_feature__ ("FLTK") && __have_feature__ ("OPENGL") && have_window_system ()) register_graphics_toolkit ("fltk"); endif +// PKG_ADD: if (__have_feature__ ("FLTK") && __have_feature__ ("OPENGL") && have_window_system () && ! (ismac () && __octave_link_enabled__ ())) register_graphics_toolkit ("fltk"); endif #if defined (HAVE_CONFIG_H) # include "config.h"