Merge pull request #5118 from cb1kenobi/timob-15972

[TIMOB-15972] Fixed bug where 64-bit iphone simulator only launched if -...
tidev · Dec 13, 2013 · 02e1863 · 02e1863
2 parents 7a4f705 + 59d015e
commit 02e1863
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/iphone/cli/hooks/run.js b/iphone/cli/hooks/run.js
@@ -76,14 +76,17 @@ exports.init = function (logger, config, cli) {
 					simEnv = path.join(build.xcodeEnv.path, 'Platforms', 'iPhoneSimulator.platform', 'Developer', 'Library', 'PrivateFrameworks') +
 							':' + afs.resolvePath(build.xcodeEnv.path, '..', 'OtherFrameworks');
 
-				if (cli.argv.retina) {
+				if (appc.version.gte(build.iosSimVersion, '7.0.0') && cli.argv['sim-64bit']) {
 					cmd.push('--retina');
-					if (appc.version.gte(build.iosSimVersion, '6.0.0') && build.iosSimType == 'iphone' && cli.argv.tall) {
+					if (build.iosSimType == 'iphone') {
 						cmd.push('--tall');
 					}
-				}
-				if (appc.version.gte(build.iosSimVersion, '7.0.0') && cli.argv['sim-64bit']) {
 					cmd.push('--sim-64bit');
+				} else if (cli.argv.retina) {
+					cmd.push('--retina');
+					if (appc.version.gte(build.iosSimVersion, '6.0.0') && build.iosSimType == 'iphone' && cli.argv.tall) {
+						cmd.push('--tall');
+					}
 				}
 				cmd = cmd.join(' ');