Merge pull request #412 from marauder2k7/development

Changes to all 3 files in one pull request

engine/source/platformiOS/iOSFileio.mm

@@ -521,7 +521,7 @@ void Platform::openFolder(const char* path )
    }
    
    const char* arg = avar("open '%s'", path);
-   U32 ret = nftw(arg, NULL, NULL , NULL);
+   U32 ret = nftw(arg, NULL, NULL, NULL);
    if(ret != 0)
       Con::printf(strerror(errno));
 }

engine/source/platformiOS/iOSProcessControl.mm

@@ -25,7 +25,7 @@
 #include "game/gameInterface.h"
 #include "platformiOS/iOSEvents.h"
 #include <pthread.h>
-
+#include <ftw.h>
 
 void Platform::postQuitMessage(const U32 in_quitVal)
 {
@@ -73,6 +73,6 @@ void Platform::restartInstance()
    execCString[len - 1] = '\0';
    
    Con::printf("---- %s -----",execCString);
-   system(execCString);
+   nftw(execCString, NULL, NULL, NULL);
    delete[] execCString;
 }

engine/source/platformiOS/iOSWindow.mm

@@ -134,7 +134,7 @@ void Platform::init()
     
     // Set RetinaEnabled and the Scale
     // NOTE: I think we could get rid of RetinaEnabled through out and just multiply directly by the scale or use RetinaScale > 1 when needed because with iPhone 6 Plus the screenScale is 3.
-    Con::setBoolVariable("$pref::iOS::RetinaEnabled", retinaEnabled);
+    Con::setBoolVariable("$pref::iOS::RetinaEnabled", gOutlineEnabled);
     Con::setBoolVariable("$pref::iOS::RetinaScale", screenScale);
     
     // Determine the Aspect Ratio and set the device type from that