beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

repo: Fix false 'Not everything is synced' messages after succesful conflict resolution

Browse source
This commit is contained in:
Hylke Bons 2012-03-16 01:53:23 +00:00
parent cca6adf473
commit 301e671747
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -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);
}
}

13
SparkleLib/SparkleRepoBase.cs
View file

@ -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");