repo base: only emit NewChangeSet event when SyncDown was successful

This commit is contained in:
Hylke Bons 2011-06-03 01:33:41 +01:00
parent 2d980d0c53
commit 4d972c66d1

View file

@ -392,8 +392,12 @@ namespace SparkleLib {
if (SyncStatusChanged != null)
SyncStatusChanged (SyncStatus.Idle);
if (NewChangeSet != null)
NewChangeSet (GetChangeSets (1) [0], LocalPath);
// There could be changes from a
// resolved conflict
// resolved conflict. Tries only once,
//then let the timer try again periodicallly
if (HasUnsyncedChanges)
SyncUp ();
@ -409,9 +413,6 @@ namespace SparkleLib {
SyncStatusChanged (SyncStatus.Idle);
this.remote_timer.Start ();
if (NewChangeSet != null)
NewChangeSet (GetChangeSets (1) [0], LocalPath);
}