From dd0a04c1c7ee7124ba5665f54ab9edad567a27f5 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Mon, 27 Feb 2023 12:03:59 +0100
Subject: [PATCH] Fixed configuration issue for cloudsync

---
 backend/go-app/main.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/backend/go-app/main.go b/backend/go-app/main.go
index 3b9757e4..e60eef79 100644
--- a/backend/go-app/main.go
+++ b/backend/go-app/main.go
@@ -3696,12 +3696,15 @@ func remoteOrgJobController(org shuffle.Org, body []byte) error {
 				return err
 			}
 
-			org.SyncConfig.Interval = 0
-			org.SyncConfig.Apikey = ""
-			org.CloudSync = false
-
 			// Just in case
 			org, err = handleStopCloudSync(syncUrl, *org)
+			if err != nil {
+				log.Printf("[ERROR] Failed stopping cloud sync remotely: %s", err)
+			}
+
+			org.SyncConfig.Interval = 0
+			org.CloudSync = false
+			org.SyncConfig.Apikey = ""
 
 			startDate := time.Now().Unix()
 			org.SyncFeatures.Webhook = shuffle.SyncData{Active: false, Type: "trigger", Name: "Webhook", StartDate: startDate}