From f792989d9b37ba0b288077302dbc5a63f5221150 Mon Sep 17 00:00:00 2001 From: Daniel Harte Date: Thu, 2 Jun 2016 00:17:48 +0000 Subject: [PATCH] gui: Show 'scanning' on unshared folders (fixes #3068) GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3239 --- gui/default/syncthing/core/syncthingController.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index 8ac4b1771..3fbea49a1 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -606,10 +606,6 @@ angular.module('syncthing.core') return 'unknown'; } - if (folderCfg.devices.length <= 1) { - return 'unshared'; - } - if ($scope.model[folderCfg.id].invalid) { return 'stopped'; } @@ -621,6 +617,13 @@ angular.module('syncthing.core') if (state === 'idle' && $scope.model[folderCfg.id].needFiles > 0) { return 'outofsync'; } + if (state === 'scanning') { + return state; + } + + if (folderCfg.devices.length <= 1) { + return 'unshared'; + } return state; };