Merge pull request #2195 from calmh/noreload

Don't trust response header (fixes #2186)

gui/syncthing/app.js

@@ -24,7 +24,6 @@ var urlbase = 'rest';
 
 syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvider) {
     $httpProvider.interceptors.push(function xHeadersResponseInterceptor() {
-        var guiVersion = null;
         var deviceId = null;
 
         return {
@@ -38,14 +37,6 @@ syncthing.config(function ($httpProvider, $translateProvider, LocaleServiceProvi
                     return response;
                 }
 
-                responseVersion = headers['x-syncthing-version'];
-
-                if (!guiVersion) {
-                    guiVersion = responseVersion;
-                } else if (guiVersion != responseVersion) {
-                    document.location.reload(true);
-                }
-
                 if (!deviceId) {
                     deviceId = headers['x-syncthing-id'];
                     if (deviceId) {

gui/syncthing/core/syncthingController.js

@@ -89,6 +89,12 @@ angular.module('syncthing.core')
             refreshFolderStats();
 
             $http.get(urlbase + '/system/version').success(function (data) {
+                if ($scope.version.version && $scope.version.version != data.version) {
+                    // We already have a version response, but it differs from
+                    // the new one. Reload the full GUI in case it's changed.
+                    document.location.reload(true);
+                }
+
                 $scope.version = data;
             }).error($scope.emitHTTPError);