Merge branch 'develop' into fix/import-screen-toggles

2 files changed, 6 insertions, 1 deletions

diff --git a/src/models/Service.js b/src/models/Service.js
index 423510c7d..bafb3f564 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -6,6 +6,7 @@ export default class Service {
   id = '';
   recipe = '';
   webview = null;
+  timer = null;
   events: {};
 
   isAttached = false;
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 20e07e540..349a609a1 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -589,12 +589,16 @@ export default class ServicesStore extends Store {
     const delay = 1000;
 
     if (service) {
+      if (service.timer !== null) {
+        clearTimeout(service.timer)
+      }  
+
       const loop = () => {
         if (!service.webview) return;
 
         service.webview.send('poll');
 
-        setTimeout(loop, delay);
+        service.timer = setTimeout(loop, delay);
       };
 
       loop();