From d87e94e9765c33ccf49d4743d2e4be94d65a5e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Mon, 30 Apr 2012 12:04:45 +0200
Subject: Add master kill switch.

---
 same/src/main/java/com/orbekk/same/SameController.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index 068ad68..c7e18fa 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -46,7 +46,9 @@ public class SameController {
         @Override
         public void disableMaster() {
             if (master != null) {
+                pServer.removeService(master.getNewService());
                 master.interrupt();
+                master = null;
             }
         }
     };
@@ -173,4 +175,8 @@ public class SameController {
     public VariableFactory createVariableFactory() {
         return new VariableFactory(client.getInterface());
     }
+    
+    public void killMaster() {
+        masterController.disableMaster();
+    }
 }
-- 
cgit v1.2.3