repo base: only emit NewChangeSet event when SyncDown was successful
This commit is contained in:
parent
6d58d5dd26
commit
209a30c0ab
|
@ -392,8 +392,12 @@ namespace SparkleLib {
|
||||||
if (SyncStatusChanged != null)
|
if (SyncStatusChanged != null)
|
||||||
SyncStatusChanged (SyncStatus.Idle);
|
SyncStatusChanged (SyncStatus.Idle);
|
||||||
|
|
||||||
|
if (NewChangeSet != null)
|
||||||
|
NewChangeSet (GetChangeSets (1) [0], LocalPath);
|
||||||
|
|
||||||
// There could be changes from a
|
// There could be changes from a
|
||||||
// resolved conflict
|
// resolved conflict. Tries only once,
|
||||||
|
//then let the timer try again periodicallly
|
||||||
if (HasUnsyncedChanges)
|
if (HasUnsyncedChanges)
|
||||||
SyncUp ();
|
SyncUp ();
|
||||||
|
|
||||||
|
@ -409,9 +413,6 @@ namespace SparkleLib {
|
||||||
SyncStatusChanged (SyncStatus.Idle);
|
SyncStatusChanged (SyncStatus.Idle);
|
||||||
|
|
||||||
this.remote_timer.Start ();
|
this.remote_timer.Start ();
|
||||||
|
|
||||||
if (NewChangeSet != null)
|
|
||||||
NewChangeSet (GetChangeSets (1) [0], LocalPath);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue