From 6bbd6b8717ce810e17b06d450f049aaaa0b3d976 Mon Sep 17 00:00:00 2001
From: Danielv123 <tranen.bananen@gmail.com>
Date: Sat, 14 Apr 2018 11:17:38 +0200
Subject: [PATCH] researchSync: Fixed crash when master contact is lost

---
 sharedPlugins/researchSync/index.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sharedPlugins/researchSync/index.js b/sharedPlugins/researchSync/index.js
index 2b6a6bb8..29c1e7fa 100644
--- a/sharedPlugins/researchSync/index.js
+++ b/sharedPlugins/researchSync/index.js
@@ -11,8 +11,8 @@ class ResearchSync {
         this.research = {};
 
         setInterval(() => {
-			this.doSync();
             this.pollResearch();
+			setTimeout(this.doSync, 2000);
         }, extras.researchSyncPollInterval || 30000);
     }
 
@@ -25,8 +25,10 @@ class ResearchSync {
         needle.post(this.config.masterIP + ':' + this.config.masterPort + '/api/getSlavesMeta', {
             password: this.config.clientPassword,
         }, (err, resp, body) => {
-            if (err) throw err;
-
+            if (err){
+				this.messageInterface("Unable to post JSON master/api/getSlavesMeta, master might be unaccessible";
+				return false;
+			}
             if (resp.statusCode != 200){
                 this.messageInterface("got error when calling getSlaveMeta", resp.statusCode, resp.body);
                 return;