Mercurial > octave-dspies

diff libinterp/dldfcn/__init_fltk__.cc @ 17881:7aadb87f599a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Display warning and don't init FLTK toolkit if no DISPLAY available (bug #40423). * libinterp/dldfcn/__init_fltk__.cc(__init_fltk__): Check for a DISPLAY and issue error if not found. Don't proceed to try and init toolkit.
author Rik <rik@octave.org>
date Thu, 07 Nov 2013 12:08:51 -0800
parents 870f3e12e163
children 8c33abdd2f9a
line wrap: on
line diff
--- a/libinterp/dldfcn/__init_fltk__.cc	Thu Nov 07 14:40:25 2013 -0500
+++ b/libinterp/dldfcn/__init_fltk__.cc	Thu Nov 07 12:08:51 2013 -0800
@@ -74,6 +74,7 @@
 #include "cmd-edit.h"
 #include "lo-ieee.h"
 
+#include "display.h"
 #include "file-ops.h"
 #include "gl-render.h"
 #include "gl2ps-renderer.h"
@@ -2090,7 +2091,9 @@
 @end deftypefn")
 {
 #ifdef HAVE_FLTK
-  if (! toolkit_loaded)
+  if (! display_info::display_available ())
+    error ("__init_fltk__: no graphics DISPLAY available");
+  else if (! toolkit_loaded)
     {
       mlock ();