Procházet zdrojové kódy

gui: Don't save ignores if they haven't been loaded (fixes #4915) (#4930)

Audrius Butkevicius před 7 roky
rodič
revize
baa3aa4bad
1 změnil soubory, kde provedl 2 přidání a 1 odebrání
  1. 2 1
      gui/default/syncthing/core/syncthingController.js

+ 2 - 1
gui/default/syncthing/core/syncthingController.js

@@ -1699,6 +1699,7 @@ angular.module('syncthing.core')
                 delete folderCfg.versioning;
                 delete folderCfg.versioning;
             }
             }
 
 
+            var ignoresLoaded = !$('#folder-ignores textarea').is(':disabled');
             var ignores = $('#folder-ignores textarea').val().split('\n');
             var ignores = $('#folder-ignores textarea').val().split('\n');
             // Split always returns a minimum 1-length array even for no patterns
             // Split always returns a minimum 1-length array even for no patterns
             if (ignores.length === 1 && ignores[0] === "") {
             if (ignores.length === 1 && ignores[0] === "") {
@@ -1711,7 +1712,7 @@ angular.module('syncthing.core')
             $scope.folders[folderCfg.id] = folderCfg;
             $scope.folders[folderCfg.id] = folderCfg;
             $scope.config.folders = folderList($scope.folders);
             $scope.config.folders = folderList($scope.folders);
 
 
-            if ($scope.editingExisting && ignores !== folderCfg.ignores) {
+            if (ignoresLoaded && $scope.editingExisting && ignores !== folderCfg.ignores) {
                 saveIgnores(ignores);
                 saveIgnores(ignores);
             };
             };