Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-02-01 10:41:52 +01:00
commit 66ef57387f
3 changed files with 940 additions and 939 deletions

View File

@ -113,7 +113,8 @@ namespace Acacia
// Create the watcher // Create the watcher
Watcher = new ZPushWatcher(Instance); Watcher = new ZPushWatcher(Instance);
OutlookUI.Watcher = Watcher; if (OutlookUI != null)
OutlookUI.Watcher = Watcher;
// Allow to features to register whatever they need // Allow to features to register whatever they need
Features = new List<Feature>(); Features = new List<Feature>();
@ -155,9 +156,6 @@ namespace Acacia
Acacia.Features.DebugSupport.Statistics.StartupTime.Stop(); Acacia.Features.DebugSupport.Statistics.StartupTime.Stop();
foreach (Feature feature in Features) foreach (Feature feature in Features)
feature.AfterStartup(); feature.AfterStartup();
// [KOE-148] Initial send receive
Instance.SendReceive();
} }
catch (System.Exception e) catch (System.Exception e)
{ {

View File

@ -77,6 +77,9 @@ namespace Acacia.ZPush
Tasks.Task(null, null, "AccountCheckDone", () => Tasks.Task(null, null, "AccountCheckDone", () =>
{ {
_watcher.OnAccountsScanned(); _watcher.OnAccountsScanned();
// [KOE-148] Initial send receive
ThisAddIn.Instance.SendReceive();
}); });
// Register for account changes // Register for account changes

File diff suppressed because it is too large Load Diff