From 761fed64cc9ef1df7ee482889ac5e8c7a9a93ca0 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Fri, 3 Jun 2016 19:50:40 -0600 Subject: [PATCH] Revert "Changes for issue #51" This reverts commit f839793071612f5e2167e1c95ef085c626cf3dd3. --- GBM/Classes/clsGame.vb | 4 +--- GBM/Managers/mgrMonitorList.vb | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/GBM/Classes/clsGame.vb b/GBM/Classes/clsGame.vb index 66a4eb4..8edd73e 100644 --- a/GBM/Classes/clsGame.vb +++ b/GBM/Classes/clsGame.vb @@ -227,6 +227,7 @@ If ID <> oGame.ID Then Return False End If + If Name <> oGame.Name Then Return False End If @@ -254,9 +255,6 @@ If Hours <> oGame.Hours Then Return False End If - If MonitorOnly <> oGame.MonitorOnly Then - Return False - End If Return True End If End Function diff --git a/GBM/Managers/mgrMonitorList.vb b/GBM/Managers/mgrMonitorList.vb index bb1c598..82956f2 100644 --- a/GBM/Managers/mgrMonitorList.vb +++ b/GBM/Managers/mgrMonitorList.vb @@ -71,7 +71,7 @@ Public Class mgrMonitorList sSQL &= "VALUES (@ID, @Name, @Process, @Path, @AbsolutePath, @FolderSave, @FileType, " sSQL &= "@TimeStamp, @ExcludeList, (SELECT ProcessPath FROM monitorlist WHERE MonitorID=@ID), " sSQL &= "(SELECT Icon FROM monitorlist WHERE MonitorID=@ID), @Hours, (SELECT Version FROM monitorlist WHERE MonitorID=@ID), " - sSQL &= "(SELECT Company FROM monitorlist WHERE MonitorID=@ID), COALESCE((SELECT Enabled FROM monitorlist WHERE MonitorID=@ID),1), @MonitorOnly);" + sSQL &= "(SELECT Company FROM monitorlist WHERE MonitorID=@ID), COALESCE((SELECT Enabled FROM monitorlist WHERE MonitorID=@ID),1), COALESCE((SELECT MonitorOnly FROM monitorlist WHERE MonitorID=@ID),0));" For Each oGame As clsGame In hshGames.Values hshParams = New Hashtable @@ -87,7 +87,6 @@ Public Class mgrMonitorList hshParams.Add("TimeStamp", oGame.AppendTimeStamp) hshParams.Add("ExcludeList", oGame.ExcludeList) hshParams.Add("Hours", oGame.Hours) - hshParams.Add("MonitorOnly", oGame.MonitorOnly) oParamList.Add(hshParams) Next @@ -157,6 +156,7 @@ Public Class mgrMonitorList If bToRemote Then DoListAddUpdateSync(hshSyncItems, mgrSQLite.Database.Remote) + Else DoListAddUpdateSync(hshSyncItems, mgrSQLite.Database.Local) End If