Fixed issue with Chromatic not being able to parse the channel causing the whole program to stop working.
This commit is contained in:
		
							parent
							
								
									cd98c92b94
								
							
						
					
					
						commit
						a729c9546b
					
				@ -6,6 +6,20 @@
 | 
				
			|||||||
	objectVersion = 45;
 | 
						objectVersion = 45;
 | 
				
			||||||
	objects = {
 | 
						objects = {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Begin PBXAggregateTarget section */
 | 
				
			||||||
 | 
							2A933E6114AB7B0900D92693 /* Build Directory */ = {
 | 
				
			||||||
 | 
								isa = PBXAggregateTarget;
 | 
				
			||||||
 | 
								buildConfigurationList = 2A933E6214AB7B0B00D92693 /* Build configuration list for PBXAggregateTarget "Build Directory" */;
 | 
				
			||||||
 | 
								buildPhases = (
 | 
				
			||||||
 | 
									2A933E6514AB7B1E00D92693 /* ShellScript */,
 | 
				
			||||||
 | 
								);
 | 
				
			||||||
 | 
								dependencies = (
 | 
				
			||||||
 | 
								);
 | 
				
			||||||
 | 
								name = "Build Directory";
 | 
				
			||||||
 | 
								productName = "Build Directory";
 | 
				
			||||||
 | 
							};
 | 
				
			||||||
 | 
					/* End PBXAggregateTarget section */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Begin PBXBuildFile section */
 | 
					/* Begin PBXBuildFile section */
 | 
				
			||||||
		1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
 | 
							1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
 | 
				
			||||||
		256AC3DA0F4B6AC300CF3369 /* MGMController.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* MGMController.m */; };
 | 
							256AC3DA0F4B6AC300CF3369 /* MGMController.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* MGMController.m */; };
 | 
				
			||||||
@ -32,6 +46,16 @@
 | 
				
			|||||||
		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 | 
							8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
 | 
				
			||||||
/* End PBXBuildFile section */
 | 
					/* End PBXBuildFile section */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Begin PBXContainerItemProxy section */
 | 
				
			||||||
 | 
							2A933E6B14AB7B6300D92693 /* PBXContainerItemProxy */ = {
 | 
				
			||||||
 | 
								isa = PBXContainerItemProxy;
 | 
				
			||||||
 | 
								containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
 | 
				
			||||||
 | 
								proxyType = 1;
 | 
				
			||||||
 | 
								remoteGlobalIDString = 2A933E6114AB7B0900D92693;
 | 
				
			||||||
 | 
								remoteInfo = "Build Directory";
 | 
				
			||||||
 | 
							};
 | 
				
			||||||
 | 
					/* End PBXContainerItemProxy section */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Begin PBXCopyFilesBuildPhase section */
 | 
					/* Begin PBXCopyFilesBuildPhase section */
 | 
				
			||||||
		2A53916813A0FEFD00CA59E3 /* Frameworks */ = {
 | 
							2A53916813A0FEFD00CA59E3 /* Frameworks */ = {
 | 
				
			||||||
			isa = PBXCopyFilesBuildPhase;
 | 
								isa = PBXCopyFilesBuildPhase;
 | 
				
			||||||
@ -217,10 +241,12 @@
 | 
				
			|||||||
				8D11072C0486CEB800E47090 /* Sources */,
 | 
									8D11072C0486CEB800E47090 /* Sources */,
 | 
				
			||||||
				8D11072E0486CEB800E47090 /* Frameworks */,
 | 
									8D11072E0486CEB800E47090 /* Frameworks */,
 | 
				
			||||||
				2A53916813A0FEFD00CA59E3 /* Frameworks */,
 | 
									2A53916813A0FEFD00CA59E3 /* Frameworks */,
 | 
				
			||||||
 | 
									2A933E6F14AB7C0700D92693 /* ShellScript */,
 | 
				
			||||||
			);
 | 
								);
 | 
				
			||||||
			buildRules = (
 | 
								buildRules = (
 | 
				
			||||||
			);
 | 
								);
 | 
				
			||||||
			dependencies = (
 | 
								dependencies = (
 | 
				
			||||||
 | 
									2A933E6C14AB7B6300D92693 /* PBXTargetDependency */,
 | 
				
			||||||
			);
 | 
								);
 | 
				
			||||||
			name = Chromatic;
 | 
								name = Chromatic;
 | 
				
			||||||
			productInstallPath = "$(HOME)/Applications";
 | 
								productInstallPath = "$(HOME)/Applications";
 | 
				
			||||||
@ -248,6 +274,7 @@
 | 
				
			|||||||
			projectRoot = "";
 | 
								projectRoot = "";
 | 
				
			||||||
			targets = (
 | 
								targets = (
 | 
				
			||||||
				8D1107260486CEB800E47090 /* Chromatic */,
 | 
									8D1107260486CEB800E47090 /* Chromatic */,
 | 
				
			||||||
 | 
									2A933E6114AB7B0900D92693 /* Build Directory */,
 | 
				
			||||||
			);
 | 
								);
 | 
				
			||||||
		};
 | 
							};
 | 
				
			||||||
/* End PBXProject section */
 | 
					/* End PBXProject section */
 | 
				
			||||||
@ -272,6 +299,35 @@
 | 
				
			|||||||
		};
 | 
							};
 | 
				
			||||||
/* End PBXResourcesBuildPhase section */
 | 
					/* End PBXResourcesBuildPhase section */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Begin PBXShellScriptBuildPhase section */
 | 
				
			||||||
 | 
							2A933E6514AB7B1E00D92693 /* ShellScript */ = {
 | 
				
			||||||
 | 
								isa = PBXShellScriptBuildPhase;
 | 
				
			||||||
 | 
								buildActionMask = 2147483647;
 | 
				
			||||||
 | 
								files = (
 | 
				
			||||||
 | 
								);
 | 
				
			||||||
 | 
								inputPaths = (
 | 
				
			||||||
 | 
								);
 | 
				
			||||||
 | 
								outputPaths = (
 | 
				
			||||||
 | 
								);
 | 
				
			||||||
 | 
								runOnlyForDeploymentPostprocessing = 0;
 | 
				
			||||||
 | 
								shellPath = /bin/sh;
 | 
				
			||||||
 | 
								shellScript = "#!/bin/bash\n#\n# Build Directory\n#\n# Created by Mr. Gecko <GRMrGecko@gmail.com> on 4/21/11.\n# No Copyright Claimed. Public Domain.\n#\n# DISCLAIMER: This script is provided as-is. I am not responsible if this script somehow causes harm to you or your system in any way, I am providing this for free in hope that it will of use to someone. I WILL NOT pay you any amount of money if anything happen to your data or you because of the changes this script makes nor am I obligated to help you fix issues this causes.\n#\n\nif [ \"$SRCROOT/build\" != \"$SYMROOT\" ]; then\nif [ -d \"$SRCROOT/build\" ]; then\n/bin/rm -Rf \"$SRCROOT/build\"\nfi\n/bin/ln -fs \"$SYMROOT\" \"$SRCROOT/build\"\nfi";
 | 
				
			||||||
 | 
							};
 | 
				
			||||||
 | 
							2A933E6F14AB7C0700D92693 /* ShellScript */ = {
 | 
				
			||||||
 | 
								isa = PBXShellScriptBuildPhase;
 | 
				
			||||||
 | 
								buildActionMask = 2147483647;
 | 
				
			||||||
 | 
								files = (
 | 
				
			||||||
 | 
								);
 | 
				
			||||||
 | 
								inputPaths = (
 | 
				
			||||||
 | 
								);
 | 
				
			||||||
 | 
								outputPaths = (
 | 
				
			||||||
 | 
								);
 | 
				
			||||||
 | 
								runOnlyForDeploymentPostprocessing = 0;
 | 
				
			||||||
 | 
								shellPath = /bin/sh;
 | 
				
			||||||
 | 
								shellScript = "#!/bin/bash\n#\n# Git Version\n#\n# Created by Mr. Gecko <GRMrGecko@gmail.com> on 4/21/11.\n# No Copyright Claimed. Public Domain.\n#\n# DISCLAIMER: This script is provided as-is. I am not responsible if this script somehow causes harm to you or your system in any way, I am providing this for free in hope that it will of use to someone. I WILL NOT pay you any amount of money if anything happen to your data or you because of the changes this script makes nor am I obligated to help you fix issues this causes.\n#\n\nPATH=\"${PATH}:/usr/local/git/bin/\"\n\nINFO=\"${CONFIGURATION_BUILD_DIR}/${CONTENTS_FOLDER_PATH}/Info\"\nGITDIR=\"${PROJECT_DIR}/.git\"\n\nVERSION=`defaults read \"${INFO}\" CFBundleVersion`\nif [ -d \"${GITDIR}\" ]; then\nREVISION=`git --git-dir=\"${GITDIR}\" rev-parse --short HEAD`\ndefaults write \"${INFO}\" CFBundleShortVersionString -string \"${VERSION} (${REVISION})\"\nelse\ndefaults write \"${INFO}\" CFBundleShortVersionString -string \"${VERSION}\"\nfi";
 | 
				
			||||||
 | 
							};
 | 
				
			||||||
 | 
					/* End PBXShellScriptBuildPhase section */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Begin PBXSourcesBuildPhase section */
 | 
					/* Begin PBXSourcesBuildPhase section */
 | 
				
			||||||
		8D11072C0486CEB800E47090 /* Sources */ = {
 | 
							8D11072C0486CEB800E47090 /* Sources */ = {
 | 
				
			||||||
			isa = PBXSourcesBuildPhase;
 | 
								isa = PBXSourcesBuildPhase;
 | 
				
			||||||
@ -287,6 +343,14 @@
 | 
				
			|||||||
		};
 | 
							};
 | 
				
			||||||
/* End PBXSourcesBuildPhase section */
 | 
					/* End PBXSourcesBuildPhase section */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Begin PBXTargetDependency section */
 | 
				
			||||||
 | 
							2A933E6C14AB7B6300D92693 /* PBXTargetDependency */ = {
 | 
				
			||||||
 | 
								isa = PBXTargetDependency;
 | 
				
			||||||
 | 
								target = 2A933E6114AB7B0900D92693 /* Build Directory */;
 | 
				
			||||||
 | 
								targetProxy = 2A933E6B14AB7B6300D92693 /* PBXContainerItemProxy */;
 | 
				
			||||||
 | 
							};
 | 
				
			||||||
 | 
					/* End PBXTargetDependency section */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Begin PBXVariantGroup section */
 | 
					/* Begin PBXVariantGroup section */
 | 
				
			||||||
		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
 | 
							089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
 | 
				
			||||||
			isa = PBXVariantGroup;
 | 
								isa = PBXVariantGroup;
 | 
				
			||||||
@ -307,6 +371,20 @@
 | 
				
			|||||||
/* End PBXVariantGroup section */
 | 
					/* End PBXVariantGroup section */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Begin XCBuildConfiguration section */
 | 
					/* Begin XCBuildConfiguration section */
 | 
				
			||||||
 | 
							2A933E6314AB7B0B00D92693 /* Debug */ = {
 | 
				
			||||||
 | 
								isa = XCBuildConfiguration;
 | 
				
			||||||
 | 
								buildSettings = {
 | 
				
			||||||
 | 
									PRODUCT_NAME = "$(TARGET_NAME)";
 | 
				
			||||||
 | 
								};
 | 
				
			||||||
 | 
								name = Debug;
 | 
				
			||||||
 | 
							};
 | 
				
			||||||
 | 
							2A933E6414AB7B0B00D92693 /* Release */ = {
 | 
				
			||||||
 | 
								isa = XCBuildConfiguration;
 | 
				
			||||||
 | 
								buildSettings = {
 | 
				
			||||||
 | 
									PRODUCT_NAME = "$(TARGET_NAME)";
 | 
				
			||||||
 | 
								};
 | 
				
			||||||
 | 
								name = Release;
 | 
				
			||||||
 | 
							};
 | 
				
			||||||
		C01FCF4B08A954540054247B /* Debug */ = {
 | 
							C01FCF4B08A954540054247B /* Debug */ = {
 | 
				
			||||||
			isa = XCBuildConfiguration;
 | 
								isa = XCBuildConfiguration;
 | 
				
			||||||
			buildSettings = {
 | 
								buildSettings = {
 | 
				
			||||||
@ -333,6 +411,7 @@
 | 
				
			|||||||
				"MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5;
 | 
									"MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5;
 | 
				
			||||||
				PRODUCT_NAME = Chromatic;
 | 
									PRODUCT_NAME = Chromatic;
 | 
				
			||||||
				SDKROOT = macosx10.5;
 | 
									SDKROOT = macosx10.5;
 | 
				
			||||||
 | 
									VALID_ARCHS = "ppc i386 x86_64";
 | 
				
			||||||
			};
 | 
								};
 | 
				
			||||||
			name = Debug;
 | 
								name = Debug;
 | 
				
			||||||
		};
 | 
							};
 | 
				
			||||||
@ -359,6 +438,7 @@
 | 
				
			|||||||
				"MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5;
 | 
									"MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5;
 | 
				
			||||||
				PRODUCT_NAME = Chromatic;
 | 
									PRODUCT_NAME = Chromatic;
 | 
				
			||||||
				SDKROOT = macosx10.5;
 | 
									SDKROOT = macosx10.5;
 | 
				
			||||||
 | 
									VALID_ARCHS = "ppc i386 x86_64";
 | 
				
			||||||
			};
 | 
								};
 | 
				
			||||||
			name = Release;
 | 
								name = Release;
 | 
				
			||||||
		};
 | 
							};
 | 
				
			||||||
@ -391,6 +471,14 @@
 | 
				
			|||||||
/* End XCBuildConfiguration section */
 | 
					/* End XCBuildConfiguration section */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Begin XCConfigurationList section */
 | 
					/* Begin XCConfigurationList section */
 | 
				
			||||||
 | 
							2A933E6214AB7B0B00D92693 /* Build configuration list for PBXAggregateTarget "Build Directory" */ = {
 | 
				
			||||||
 | 
								isa = XCConfigurationList;
 | 
				
			||||||
 | 
								buildConfigurations = (
 | 
				
			||||||
 | 
									2A933E6314AB7B0B00D92693 /* Debug */,
 | 
				
			||||||
 | 
									2A933E6414AB7B0B00D92693 /* Release */,
 | 
				
			||||||
 | 
								);
 | 
				
			||||||
 | 
								defaultConfigurationIsVisible = 0;
 | 
				
			||||||
 | 
							};
 | 
				
			||||||
		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Chromatic" */ = {
 | 
							C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Chromatic" */ = {
 | 
				
			||||||
			isa = XCConfigurationList;
 | 
								isa = XCConfigurationList;
 | 
				
			||||||
			buildConfigurations = (
 | 
								buildConfigurations = (
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										7
									
								
								Chromatic.xcodeproj/project.xcworkspace/contents.xcworkspacedata
									
									
									
										generated
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								Chromatic.xcodeproj/project.xcworkspace/contents.xcworkspacedata
									
									
									
										generated
									
									
									
										Normal file
									
								
							@ -0,0 +1,7 @@
 | 
				
			|||||||
 | 
					<?xml version="1.0" encoding="UTF-8"?>
 | 
				
			||||||
 | 
					<Workspace
 | 
				
			||||||
 | 
					   version = "1.0">
 | 
				
			||||||
 | 
					   <FileRef
 | 
				
			||||||
 | 
					      location = "self:Chromatic.xcodeproj">
 | 
				
			||||||
 | 
					   </FileRef>
 | 
				
			||||||
 | 
					</Workspace>
 | 
				
			||||||
@ -203,7 +203,8 @@ NSString * const MGMUBCancel = @"Cancel";
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	for (int i=0; i<[versions count]; i++) {
 | 
						for (int i=0; i<[versions count]; i++) {
 | 
				
			||||||
		NSDictionary *versionInfo = [versions objectAtIndex:i];
 | 
							NSDictionary *versionInfo = [versions objectAtIndex:i];
 | 
				
			||||||
		[channelRevisions setObject:[[versionInfo objectForKey:MGMCRevision] stringValue] forKey:[versionInfo objectForKey:MGMCChannel]];
 | 
					        id channel = [versionInfo objectForKey:MGMCRevision];
 | 
				
			||||||
 | 
							[channelRevisions setObject:([channel isKindOfClass:[NSString class]] ? channel : [channel stringValue]) forKey:[versionInfo objectForKey:MGMCChannel]];
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	[progress setIndeterminate:NO];
 | 
						[progress setIndeterminate:NO];
 | 
				
			||||||
 | 
				
			|||||||
@ -17,11 +17,11 @@
 | 
				
			|||||||
	<key>CFBundlePackageType</key>
 | 
						<key>CFBundlePackageType</key>
 | 
				
			||||||
	<string>APPL</string>
 | 
						<string>APPL</string>
 | 
				
			||||||
	<key>CFBundleShortVersionString</key>
 | 
						<key>CFBundleShortVersionString</key>
 | 
				
			||||||
	<string>0.2.1</string>
 | 
						<string>0.2.2</string>
 | 
				
			||||||
	<key>CFBundleSignature</key>
 | 
						<key>CFBundleSignature</key>
 | 
				
			||||||
	<string>????</string>
 | 
						<string>????</string>
 | 
				
			||||||
	<key>CFBundleVersion</key>
 | 
						<key>CFBundleVersion</key>
 | 
				
			||||||
	<string>0.2.1</string>
 | 
						<string>0.2.2</string>
 | 
				
			||||||
	<key>LSMinimumSystemVersion</key>
 | 
						<key>LSMinimumSystemVersion</key>
 | 
				
			||||||
	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 | 
						<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 | 
				
			||||||
	<key>MGMGRBugsEmail</key>
 | 
						<key>MGMGRBugsEmail</key>
 | 
				
			||||||
@ -37,7 +37,7 @@
 | 
				
			|||||||
	<key>MGMGRTimeZone</key>
 | 
						<key>MGMGRTimeZone</key>
 | 
				
			||||||
	<string>CST</string>
 | 
						<string>CST</string>
 | 
				
			||||||
	<key>NSHumanReadableCopyright</key>
 | 
						<key>NSHumanReadableCopyright</key>
 | 
				
			||||||
	<string>Copyright (c) 2011 Mr. Gecko's Media (James Coleman). http://mrgeckosmedia.com/</string>
 | 
						<string>Copyright (c) 2011 Mr. Gecko's Media (James Coleman). http://mrgeckosmedia.com/</string>
 | 
				
			||||||
	<key>NSMainNibFile</key>
 | 
						<key>NSMainNibFile</key>
 | 
				
			||||||
	<string>MainMenu</string>
 | 
						<string>MainMenu</string>
 | 
				
			||||||
	<key>NSPrincipalClass</key>
 | 
						<key>NSPrincipalClass</key>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user