From 84ea69358fb3f54970dd7d3f31c30528b850709e Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Wed, 15 Feb 2012 01:57:43 +0100
Subject: [PATCH] Removed unused variable, fixed chdir regression.

---
 src/cocoa_init.m     | 20 ++++++++++++--------
 src/cocoa_platform.h |  1 -
 src/cocoa_window.m   |  1 -
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/cocoa_init.m b/src/cocoa_init.m
index 45088a4e..16ea6e68 100644
--- a/src/cocoa_init.m
+++ b/src/cocoa_init.m
@@ -35,23 +35,28 @@
 //========================================================================
 static void changeToResourcesDirectory(void)
 {
+    char resourcesPath[MAXPATHLEN];
+
     CFBundleRef bundle = CFBundleGetMainBundle();
     if (!bundle)
         return;
 
     CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(bundle);
-    char resourcesPath[MAXPATHLEN];
 
-    CFStringRef name = CFURLCopyLastPathComponent(resourcesURL);
-    if (CFStringCompare(CFSTR("Resources"), name, 0) != kCFCompareEqualTo)
+    CFStringRef last = CFURLCopyLastPathComponent(resourcesURL);
+    if (CFStringCompare(CFSTR("Resources"), last, 0) != kCFCompareEqualTo)
+    {
+        CFRelease(last);
+        CFRelease(resourcesURL);
         return;
+    }
 
-    CFRelease(name);
+    CFRelease(last);
 
     if (!CFURLGetFileSystemRepresentation(resourcesURL,
-                                          TRUE,
+                                          true,
                                           (UInt8*) resourcesPath,
-                                          MAXPATHLEN));
+                                          MAXPATHLEN))
     {
         CFRelease(resourcesURL);
         return;
@@ -82,8 +87,7 @@ int _glfwPlatformInit(void)
         return GL_FALSE;
     }
 
-    if (_glfwLibrary.NS.bundled)
-        changeToResourcesDirectory();
+    changeToResourcesDirectory();
 
     _glfwLibrary.NS.desktopMode =
 	    (NSDictionary*) CGDisplayCurrentMode(CGMainDisplayID());
diff --git a/src/cocoa_platform.h b/src/cocoa_platform.h
index 582b338d..1a90af01 100644
--- a/src/cocoa_platform.h
+++ b/src/cocoa_platform.h
@@ -91,7 +91,6 @@ typedef struct _GLFWlibraryNS
 
     // dlopen handle for dynamically loading OpenGL extension entry points
     void*       OpenGLFramework;
-    GLboolean   bundled;
     id          desktopMode;
     id          delegate;
     id          autoreleasePool;
diff --git a/src/cocoa_window.m b/src/cocoa_window.m
index 6bfd0971..221dcc5e 100644
--- a/src/cocoa_window.m
+++ b/src/cocoa_window.m
@@ -500,7 +500,6 @@ static NSString* findAppName(void)
             [name isKindOfClass:[NSString class]] &&
             ![@"" isEqualToString:name])
         {
-            _glfwLibrary.NS.bundled = GL_TRUE;
             return name;
         }
     }