diff options
| -rw-r--r-- | www/js/EventModalCtrl.js | 9 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js index 2b0edb50..cf77aa3d 100644 --- a/www/js/EventModalCtrl.js +++ b/www/js/EventModalCtrl.js @@ -587,8 +587,13 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro sendCommand('1', $scope.connKey). then(function (resp) { - // console.log ("PAUSE ANSWER IS " + JSON.stringify(resp)); - $scope.currentProgress.progress = resp.data.status.progress; + console.log ("PAUSE ANSWER IS " + JSON.stringify(resp)); + + if (resp && resp.data && resp.data.status) + $scope.currentProgress.progress = resp.data.status.progress; + else + $scope.currentProgress.progress = 100; + // console.log ("STEP 0 progress is " + $scope.currentProgress.progress); $scope.slides = []; diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index c51ef443..598bde23 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -155,7 +155,7 @@ <a href="" ng-click="toggleGapless()"> <i class="ion-ios-loop-strong"></i>-{{loginData.gapless? ('kOn' | translate): ('kOff' | translate)}}</a> </li> - <li ng-if="defaultVideo=='' && isToggleListMenu"> + <li ng-if="defaultVideo=='' && isToggleListMenu && (!isSnapShot() || liveFeedMid) "> <a href="" ng-click="saveEventImageToPhoneWithPerms(false)"> <i class="ion-ios-camera"></i> </a> |