Merge deff11c into f0e895a

maidsafe-archive · Jul 28, 2016 · 360c445 · 360c445
2 parents f0e895a + deff11c
commit 360c445
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/app/scripts/controllers/user_controller.js b/app/scripts/controllers/user_controller.js
@@ -69,7 +69,8 @@ window.safeLauncher.controller('userController', [ '$scope', '$state', '$rootSco
       $rootScope.clearIntervals();
       $rootScope.resetStats();
       $rootScope.resetAppStates();
-      server.reconnectNetwork();
+      server.stopProxyServer();
+      server.reconnectNetwork();      
       $state.go('app.account', {
         currentPage: 'login'
       });

diff --git a/app/scripts/factories/event_register.js b/app/scripts/factories/event_register.js
@@ -87,14 +87,7 @@ window.safeLauncher.factory('eventRegistrationFactory', [ '$rootScope', 'serverF
       // handle proxy start
       server.onProxyStart(function(msg) {
         $rootScope.$proxyServer = true;
-        $rootScope.setProxy(true);
-        $rootScope.$toaster.show({
-          msg: 'Proxy Server started',
-          hasOption: false,
-          isError: false
-        }, function(err, data) {
-          console.log('Proxy Server started');
-        });
+        $rootScope.setProxy(true);        
       });
 
       // handle proxy stop