Merge branch 'issue-1394' of https://github.com/phw198/OutlookGoogleC…

…alendarSync into release Fixes #1394
phw198 · Mar 27, 2022 · 86f43d6 · 86f43d6
2 parents 39deab5 + 01cb854
commit 86f43d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/OutlookGoogleCalendarSync/SettingsStore/Upgrade.cs b/src/OutlookGoogleCalendarSync/SettingsStore/Upgrade.cs
@@ -1,18 +1,15 @@
-using System;
+using log4net;
+using System;
 using System.IO;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using log4net;
+using System.Windows.Forms;
 using System.Xml.Linq;
 
 namespace OutlookGoogleCalendarSync.SettingsStore {
     public static class Upgrade {
         private static readonly ILog log = LogManager.GetLogger(typeof(Upgrade));
 
         //OGCS releases that require the settings XML to be upgraded
-        private static Int32 multipleCalendars = Program.VersionToInt("2.9.1.1");
+        private static Int32 multipleCalendars = Program.VersionToInt("2.9.3.0");
 
         private static String settingsVersion;
         private static Int32 settingsVersionNum;

diff --git a/src/OutlookGoogleCalendarSync/Sync/Calendar.cs b/src/OutlookGoogleCalendarSync/Sync/Calendar.cs
@@ -297,7 +297,8 @@ private SyncResult synchronize() {
                 try {
                     #region Read Outlook items
                     console.Update("Scanning Outlook calendar...");
-                    outlookEntries = OutlookOgcs.Calendar.Instance.GetCalendarEntriesInRange(null, false);
+                    OutlookOgcs.Calendar.Instance.IOutlook.UseOutlookCalendar(OutlookOgcs.Calendar.Instance.IOutlook.GetFolderByID(Sync.Engine.Calendar.Instance.Profile.UseOutlookCalendar.Id));
+                    outlookEntries = OutlookOgcs.Calendar.Instance.GetCalendarEntriesInRange(Sync.Engine.Calendar.Instance.Profile, false);
                     console.Update(outlookEntries.Count + " Outlook calendar entries found.", Console.Markup.sectionEnd, newLine: false);
 
                     if (Sync.Engine.Instance.CancellationPending) return SyncResult.UserCancelled;