Merge pull request #2173 from mobiware/ios-full-reset-prefs5

Fix #2133
This commit is contained in:
Jonathan Lipps
2014-03-25 10:54:19 -07:00

View File

@@ -504,13 +504,6 @@ IOS.prototype.setPreferences = function (cb) {
return cb();
}
if (this.args.fullReset) {
var msg = "Cannot set preferences because a full-reset was requested";
logger.info(msg);
logger.error(msg);
return cb(new Error(msg));
}
var settingsCaps = [
'locationServicesEnabled',
'locationServicesAuthorized',
@@ -534,6 +527,11 @@ IOS.prototype.setPreferences = function (cb) {
if (!needToSet) {
logger.info("No iOS / app preferences to set");
return cb();
} else if (this.args.fullReset) {
var msg = "Cannot set preferences because a full-reset was requested";
logger.info(msg);
logger.error(msg);
return cb(new Error(msg));
}
var setPrefs = function (err) {