Added safety 2nd timeout to startRemoteConnect.

This commit is contained in:
Gunther Brunner
2014-08-18 18:56:58 +09:00
parent 8347568ce0
commit 74c30a70b9

View File

@@ -1,17 +1,24 @@
module.exports = function RemoteDebugCtrl($scope, $timeout) {
function startRemoteConnect() {
$scope.control.startRemoteConnect().then(function (result) {
var url = result.lastData
$scope.$apply(function () {
$scope.debugCommand = 'adb connect ' + url
if ($scope.control) {
$scope.control.startRemoteConnect().then(function (result) {
var url = result.lastData
$scope.$apply(function () {
$scope.debugCommand = 'adb connect ' + url
})
})
})
return true
}
return false
}
// TODO: Remove timeout and fix control initialization
if ($scope.control) {
startRemoteConnect()
} else {
$timeout(startRemoteConnect, 200)
if (!startRemoteConnect()) {
$timeout(function () {
if (!startRemoteConnect()) {
$timeout(startRemoteConnect, 1000)
}
}, 200)
}
}