From 6586b77975636da3d96d277d7556a8bbc8d0031b Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sun, 3 Dec 2017 15:46:12 +0000
Subject: Restore possibility to run fl_open_display() within a static
 initializer.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12578 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_cocoa.mm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index cb0cb1cea..d48b5308e 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3776,7 +3776,7 @@ static void createAppleMenu(void)
   NSMenuItem *menuItem;
   NSString *title;
   
-  SEL infodictSEL = (fl_mac_os_version >= 100200 ? @selector(localizedInfoDictionary) : @selector(infoDictionary));
+  SEL infodictSEL = (Fl_Darwin_System_Driver::calc_mac_os_version() >= 100200 ? @selector(localizedInfoDictionary) : @selector(infoDictionary));
   NSString *nsappname = [[[NSBundle mainBundle] performSelector:infodictSEL] objectForKey:@"CFBundleName"];  
   if (nsappname == nil)
     nsappname = [[NSProcessInfo processInfo] processName];
@@ -4389,7 +4389,7 @@ int Fl_Darwin_System_Driver::calc_mac_os_version() {
     sscanf(s, "%d.%d.%d", &M, &m, &b);
   }
   [localPool release];
-  return M*10000 + m*100 + b;
+  return fl_mac_os_version = M*10000 + m*100 + b;
 }
 
 //
-- 
cgit v1.2.3