From 9eb095523ea751d03b2f50c2bb5dc1c4682cf8bb Mon Sep 17 00:00:00 2001
From: MikeMaximus <mseiferling@gmail.com>
Date: Sat, 10 Mar 2018 10:52:39 -0600
Subject: [PATCH] Fixed some settings and database update issues

---
 GBM/Forms/frmStartUpWizard.vb |  1 -
 GBM/Managers/mgrSQLite.vb     | 14 ++++++++------
 GBM/Managers/mgrSettings.vb   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/GBM/Forms/frmStartUpWizard.vb b/GBM/Forms/frmStartUpWizard.vb
index cbcae36..401d3a7 100644
--- a/GBM/Forms/frmStartUpWizard.vb
+++ b/GBM/Forms/frmStartUpWizard.vb
@@ -131,7 +131,6 @@ Public Class frmStartUpWizard
         frm.DisableExternalFunctions = True
         frm.ShowDialog()
         LoadGameSettings()
-        mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
     End Sub
 
     Private Function ValidateBackupPath(ByVal strPath As String, ByRef sErrorMessage As String) As Boolean
diff --git a/GBM/Managers/mgrSQLite.vb b/GBM/Managers/mgrSQLite.vb
index ef1a751..6767210 100644
--- a/GBM/Managers/mgrSQLite.vb
+++ b/GBM/Managers/mgrSQLite.vb
@@ -778,7 +778,7 @@ Public Class mgrSQLite
                 sSQL &= "CREATE TABLE gameprocesses (ProcessID TEXT NOT NULL, MonitorID TEXT NOT NULL, PRIMARY KEY(ProcessID, MonitorID));"
 
                 'Overhaul Tables
-                sSQL = "CREATE TABLE settings_new (SettingsID INTEGER NOT NULL PRIMARY KEY, MonitorOnStartup BOOLEAN NOT NULL, StartToTray BOOLEAN NOT NULL, ShowDetectionToolTips BOOLEAN NOT NULL, " &
+                sSQL &= "CREATE TABLE settings_new (SettingsID INTEGER NOT NULL PRIMARY KEY, MonitorOnStartup BOOLEAN NOT NULL, StartToTray BOOLEAN NOT NULL, ShowDetectionToolTips BOOLEAN NOT NULL, " &
                    "DisableConfirmation BOOLEAN NOT NULL, CreateSubFolder BOOLEAN NOT NULL, ShowOverwriteWarning BOOLEAN NOT NULL, RestoreOnLaunch BOOLEAN NOT NULL, " &
                    "BackupFolder TEXT NOT NULL, StartWithWindows BOOLEAN NOT NULL, TimeTracking BOOLEAN NOT NULL, " &
                    "SupressBackup BOOLEAN NOT NULL, SupressBackupThreshold INTEGER NOT NULL, CompressionLevel INTEGER NOT NULL, Custom7zArguments TEXT, " &
@@ -813,11 +813,6 @@ Public Class mgrSQLite
                 'Backup DB before starting
                 BackupDB("v108")
 
-                'The remote manifest now requires a synced monitorlist to function.  We need to force a sync for users that had it disabled, otherwise their manifest will be lost.
-                Dim oSettings As New mgrSettings
-                oSettings.LoadSettings()
-                mgrMonitorList.SyncMonitorLists(oSettings.SyncFields)
-
                 'Overhaul Tables
                 sSQL = "CREATE TABLE monitorlist_new (MonitorID TEXT NOT NULL PRIMARY KEY, Name TEXT NOT NULL, Process TEXT NOT NULL, Path TEXT, " &
                    "AbsolutePath BOOLEAN NOT NULL, FolderSave BOOLEAN NOT NULL, FileType TEXT, TimeStamp BOOLEAN NOT NULL, ExcludeList TEXT NOT NULL, " &
@@ -828,6 +823,13 @@ Public Class mgrSQLite
                    "SELECT MonitorID, Name, Process, Path, AbsolutePath, FolderSave, FileType, TimeStamp, ExcludeList, " &
                    "ProcessPath, Icon, Hours, Version, Company, Enabled, MonitorOnly, BackupLimit, CleanFolder, Parameter, Comments, IsRegEx FROM monitorlist;" &
                    "DROP TABLE monitorlist; ALTER TABLE monitorlist_new RENAME TO monitorlist;"
+
+                'We need to push the local database game list against the remote database in case they had syncing disabled
+                Dim hshMonitorList As Hashtable = mgrMonitorList.ReadList(mgrMonitorList.eListTypes.FullList, mgrSQLite.Database.Local)
+                Dim oSettings As New mgrSettings
+                oSettings.LoadSettings()
+                mgrMonitorList.DoListAddUpdateSync(hshMonitorList, Database.Remote, oSettings.SyncFields)
+
                 sSQL &= "CREATE TABLE manifest_new (ManifestID TEXT NOT NULL PRIMARY KEY, MonitorID TEXT NOT NULL, FileName TEXT NOT NULL, " &
                    "DateUpdated TEXT NOT NULL, UpdatedBy TEXT NOT NULL, CheckSum TEXT);"
                 sSQL &= "INSERT INTO manifest_new (ManifestID, MonitorID, FileName, DateUpdated, UpdatedBy, CheckSum) " &
diff --git a/GBM/Managers/mgrSettings.vb b/GBM/Managers/mgrSettings.vb
index 84f1d4d..3668cbc 100644
--- a/GBM/Managers/mgrSettings.vb
+++ b/GBM/Managers/mgrSettings.vb
@@ -277,7 +277,7 @@ Public Class mgrSettings
 
     Sub New()
         'The GameIDsync message should be supressed on all new databases
-        SetMessageField(SupressMessages, eSupressMessages.GameIDSync)
+        SupressMessages = SetMessageField(SupressMessages, eSupressMessages.GameIDSync)
     End Sub
 
     Private Sub SaveFromClass()