From: James Turner <zakalawe@mac.com>
Date: Sun, 20 Sep 2015 14:13:49 +0000 (-0500)
Subject: Work around a strange link failure on Mac
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c2cbb36d1629a246582e03c8b198e2bdaefb1b05;p=flightgear.git

Work around a strange link failure on Mac

- Xcode 7 seems to dislike this code as was, adjusted version
links fine. Very odd.
---

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index b566f5339..a839ae6f2 100644
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -437,7 +437,24 @@ namespace
 {
     using namespace flightgear;
 
-    class GUISnapShotOperation : 
+    SGPath nextScreenshotPath(const std::string& screenshotDir)
+    {
+        char filename[32];
+        static int count = 1;
+        while (count < 1000) {
+            snprintf(filename, 32, "fgfs-screen-%03d.png", count++);
+            
+            SGPath p(screenshotDir);
+            p.append(filename);
+            if (!p.exists()) {
+                return p;
+            }
+        }
+        
+        return SGPath();
+    }
+    
+    class GUISnapShotOperation :
         public GraphicsContextOperation
     {
     public:
@@ -489,19 +506,7 @@ namespace
                 dir = globals->get_fg_home();
             }
 
-            char filename[24];
-            static int count = 1;
-            while (count < 1000) {
-                snprintf(filename, 24, "fgfs-screen-%03d.png", count++);
-
-                SGPath p(dir);
-                p.append(filename);
-                if (!p.exists()) {
-                    _path.set(p.str());
-                    break;
-                }
-            }
-
+            _path = nextScreenshotPath(dir);
             _xsize = fgGetInt("/sim/startup/xsize");
             _ysize = fgGetInt("/sim/startup/ysize");