fix crash if file was renamed remote
see #8 (https://github.com/wimh/SparkleShare/issues/8)
This commit is contained in:
parent
77caf67a8d
commit
0a9aaff4b8
|
@ -494,7 +494,8 @@ namespace SparkleLib {
|
||||||
|
|
||||||
if ((change_set.Added.Count +
|
if ((change_set.Added.Count +
|
||||||
change_set.Edited.Count +
|
change_set.Edited.Count +
|
||||||
change_set.Deleted.Count) > 0) {
|
change_set.Deleted.Count +
|
||||||
|
change_set.MovedFrom.Count) > 0) {
|
||||||
|
|
||||||
change_set.Notes.AddRange (GetNotes (change_set.Revision));
|
change_set.Notes.AddRange (GetNotes (change_set.Revision));
|
||||||
change_sets.Add (change_set);
|
change_sets.Add (change_set);
|
||||||
|
|
|
@ -442,8 +442,13 @@ namespace SparkleLib {
|
||||||
if (SyncStatusChanged != null)
|
if (SyncStatusChanged != null)
|
||||||
SyncStatusChanged (SyncStatus.Idle);
|
SyncStatusChanged (SyncStatus.Idle);
|
||||||
|
|
||||||
|
List<SparkleChangeSet> change_sets = GetChangeSets (1);
|
||||||
|
if (change_sets != null && change_sets.Count > 0) {
|
||||||
|
SparkleChangeSet change_set = change_sets [0];
|
||||||
|
|
||||||
if (NewChangeSet != null)
|
if (NewChangeSet != null)
|
||||||
NewChangeSet (GetChangeSets (1) [0], LocalPath);
|
NewChangeSet (change_set, LocalPath);
|
||||||
|
}
|
||||||
|
|
||||||
// There could be changes from a
|
// There could be changes from a
|
||||||
// resolved conflict. Tries only once,
|
// resolved conflict. Tries only once,
|
||||||
|
|
Loading…
Reference in a new issue