repo: Fix false 'Not everything is synced' messages after succesful conflict resolution
This commit is contained in:
parent
babd13fa36
commit
7afdaabc68
|
@ -132,7 +132,7 @@ namespace SparkleLib.Git {
|
|||
line [1].ToString ().Equals ("A")) {
|
||||
|
||||
string path = line.Substring (3);
|
||||
path = path.Trim ("\"".ToCharArray ());
|
||||
path = path.Trim ("\"".ToCharArray ());
|
||||
file_paths.Add (path);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -325,9 +325,6 @@ namespace SparkleLib {
|
|||
SparkleHelpers.DebugInfo ("SyncDown", "[" + Name + "] Done");
|
||||
this.server_online = true;
|
||||
|
||||
if (SyncStatusChanged != null)
|
||||
SyncStatusChanged (SyncStatus.Idle);
|
||||
|
||||
if (!pre_sync_revision.Equals (CurrentRevision)) {
|
||||
List<SparkleChangeSet> change_sets = GetChangeSets (1);
|
||||
|
||||
|
@ -340,8 +337,16 @@ namespace SparkleLib {
|
|||
// There could be changes from a resolved
|
||||
// conflict. Tries only once, then lets
|
||||
// the timer try again periodically
|
||||
if (HasUnsyncedChanges)
|
||||
if (HasUnsyncedChanges) {
|
||||
if (SyncStatusChanged != null)
|
||||
SyncStatusChanged (SyncStatus.SyncUp);
|
||||
|
||||
SyncUp ();
|
||||
HasUnsyncedChanges = false;
|
||||
}
|
||||
|
||||
if (SyncStatusChanged != null)
|
||||
SyncStatusChanged (SyncStatus.Idle);
|
||||
|
||||
} else {
|
||||
SparkleHelpers.DebugInfo ("SyncDown", "[" + Name + "] Error");
|
||||
|
|
Loading…
Reference in a new issue