haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a case where the previous backup's progress "hangs" after the backup is stopped.

Browse Source
This commit is contained in:
Kenneth Skovhede
2017-06-20 13:05:09 +02:00
parent a2b5b01048
commit 086b2f3bb8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Server/webroot/ngax/scripts/controllers/StateController.js
+2 -1
View File
@@ -24,7 +24,7 @@ backupApp.controller('StateController', function($scope, $timeout, ServerStatus,
function updateStateDisplay() {
var text = gettextCatalog.getString('Running ...');
var pg = -1;
if ($scope.state.lastPgEvent != null)
if ($scope.state.lastPgEvent != null && $scope.state.activeTask != null)
{
text = ServerStatus.progress_state_text[$scope.state.lastPgEvent.Phase || ''] || $scope.state.lastPgEvent.Phase;
@@ -72,6 +72,7 @@ backupApp.controller('StateController', function($scope, $timeout, ServerStatus,
};
$scope.$watch('state.lastPgEvent', updateStateDisplay, true);
$scope.$on('serverstatechanged', updateStateDisplay);
$scope.stopDialog = function() {
if ($scope.activeTaskID == null)