From 3eea7f12162804dcf472740209ac340f7b6c4ba9 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Thu, 26 Nov 2015 14:59:54 +0100
Subject: script reloader: minor fixes

---
 libmproxy/script/reloader.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'libmproxy/script/reloader.py')

diff --git a/libmproxy/script/reloader.py b/libmproxy/script/reloader.py
index b867238f..26691fa3 100644
--- a/libmproxy/script/reloader.py
+++ b/libmproxy/script/reloader.py
@@ -6,6 +6,8 @@ _observers = {}
 
 
 def watch(script, callback):
+    if script in _observers:
+        raise RuntimeError("Script already observed")
     script_dir = os.path.dirname(os.path.abspath(script.args[0]))
     event_handler = _ScriptModificationHandler(callback)
     observer = Observer()
@@ -18,6 +20,7 @@ def unwatch(script):
     observer = _observers.pop(script, None)
     if observer:
         observer.stop()
+        observer.join()
 
 
 class _ScriptModificationHandler(PatternMatchingEventHandler):
-- 
cgit v1.2.3