From 2ccc10bb9c74b862186686ce86e2b9428f9a071e Mon Sep 17 00:00:00 2001
From: MikeMaximus <mseiferling@gmail.com>
Date: Thu, 16 Mar 2017 17:12:01 -0600
Subject: [PATCH] Fixed sync setting conflict with issue #67

---
 GBM/Forms/frmMain.vb | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb
index cd10986..8b5e51e 100644
--- a/GBM/Forms/frmMain.vb
+++ b/GBM/Forms/frmMain.vb
@@ -919,34 +919,28 @@ Public Class frmMain
     End Sub
 
     Private Sub StartSyncWatcher()
-        If oSettings.Sync Then
-            oFileWatcher.EnableRaisingEvents = True
-        End If
+        oFileWatcher.EnableRaisingEvents = True
     End Sub
 
     Private Sub StopSyncWatcher()
-        If oSettings.Sync Then
-            oFileWatcher.EnableRaisingEvents = False
-        End If
+        oFileWatcher.EnableRaisingEvents = False
     End Sub
 
     Private Sub SetupSyncWatcher()
-        If oSettings.Sync Then
-            oFileWatcher.Path = oSettings.BackupFolder
-            oFileWatcher.Filter = "gbm.s3db"
-            oFileWatcher.NotifyFilter = NotifyFilters.LastWrite
-        End If
+        oFileWatcher.Path = oSettings.BackupFolder
+        oFileWatcher.Filter = "gbm.s3db"
+        oFileWatcher.NotifyFilter = NotifyFilters.LastWrite
     End Sub
 
     Private Sub HandleSyncWatcher() Handles oFileWatcher.Changed
+        StopSyncWatcher()
         If oSettings.Sync Then
-            StopSyncWatcher()
             UpdateLog(frmMain_MasterListChanged, False, ToolTipIcon.Info, True)
             SyncGameSettings()
             LoadGameSettings()
-            CheckForNewBackups()
-            StartSyncWatcher()
         End If
+        CheckForNewBackups()
+        StartSyncWatcher()
     End Sub
 
     Private Sub SyncGameSettings()