refactoring after review

Author: Plamen5kov

mobile/mobile-core/devices-service.ts

@@ -384,26 +384,28 @@ If you are trying to run on specific emulator, use tns run –device <DeviceID>.
 		await this.detectCurrentlyAttachedDevices();
 		let deviceInstances = this.getDeviceInstances();
 
-		//if no --device is passed and no devices are found, the default emulator is started
-		if (data && data.platform && !data.deviceId && _.isEmpty(deviceInstances)) {
-			return await this.startEmulator(data.platform);
-		}
+		if(data && data.platform) {
+			//if no --device is passed and no devices are found, the default emulator is started
+			if (!data.deviceId && _.isEmpty(deviceInstances)) {
+				return await this.startEmulator(data.platform);
+			}
 
-		//check if --device(value) is running, if it's not or it's not the same as is specified, start with name from --device(value)
-		if (data && data.platform && data.deviceId) {
-			if (!helpers.isNumber(data.deviceId))  {
-				let activeDeviceInstance = _.find(this.getDeviceInstances(), (device: Mobile.IDevice) => { return device.deviceInfo.identifier === data.deviceId; });
-				if (!activeDeviceInstance) {
-					return await this.startEmulator(data.platform, data.deviceId);
+			//check if --device(value) is running, if it's not or it's not the same as is specified, start with name from --device(value)
+			if (data.deviceId) {
+				if (!helpers.isNumber(data.deviceId))  {
+					let activeDeviceInstance = _.find(this.getDeviceInstances(), (device: Mobile.IDevice) => { return device.deviceInfo.identifier === data.deviceId; });
+					if (!activeDeviceInstance) {
+						return await this.startEmulator(data.platform, data.deviceId);
+					}
 				}
 			}
-		}
 
-		// if only emulator flag is passed and no other emulators are running, start default emulator
-		if (data && data.platform && data.emulator && deviceInstances.length) {
-			let runningDeviceInstance = _.some(deviceInstances, (value) => {return value.isEmulator; });
-			if (!runningDeviceInstance) {
-				return await this.startEmulator(data.platform);
+			// if only emulator flag is passed and no other emulators are running, start default emulator
+			if (data.emulator && deviceInstances.length) {
+				let runningDeviceInstance = _.some(deviceInstances, (value) => {return value.isEmulator; });
+				if (!runningDeviceInstance) {
+					return await this.startEmulator(data.platform);
+				}
 			}
 		}
 	}