From 6097c134d893c67aa6d3d56ee176531c481261a8 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Wed, 24 Feb 2016 08:07:30 +0000
Subject: Avoid static initializers to allow FLTK usage in static initializers.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11213 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl.cxx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Fl.cxx b/src/Fl.cxx
index c0120b13d..a27a187fd 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -216,16 +216,12 @@ char const * const Fl::clipboard_image = "image";
 // Drivers
 //
 
-Fl_Screen_Driver *Fl::screen_driver_ = Fl_Screen_Driver::newScreenDriver();
-
 Fl_Screen_Driver *Fl::screen_driver()
 {
-  if (!screen_driver_)
-    screen_driver_ = Fl_Screen_Driver::newScreenDriver();
+  static  Fl_Screen_Driver* screen_driver_ = Fl_Screen_Driver::newScreenDriver();
   return screen_driver_;
 }
 
-
 //
 // 'Fl::version()' - Return the API version number...
 //
-- 
cgit v1.2.3