fix crash if file was renamed remote
see #8 (https://github.com/wimh/SparkleShare/issues/8)
This commit is contained in:
parent
60273631f3
commit
1e32374e81
|
@ -493,7 +493,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);
|
||||||
|
|
|
@ -444,22 +444,25 @@ namespace SparkleLib {
|
||||||
if (SyncStatusChanged != null)
|
if (SyncStatusChanged != null)
|
||||||
SyncStatusChanged (SyncStatus.Idle);
|
SyncStatusChanged (SyncStatus.Idle);
|
||||||
|
|
||||||
SparkleChangeSet change_set = GetChangeSets (1) [0];
|
List<SparkleChangeSet> change_sets = GetChangeSets (1);
|
||||||
|
if (change_sets != null && change_sets.Count > 0) {
|
||||||
|
SparkleChangeSet change_set = change_sets [0];
|
||||||
|
|
||||||
bool note_added = false;
|
bool note_added = false;
|
||||||
foreach (string added in change_set.Added) {
|
foreach (string added in change_set.Added) {
|
||||||
if (added.Contains (".notes")) {
|
if (added.Contains (".notes")) {
|
||||||
if (NewNote != null)
|
if (NewNote != null)
|
||||||
NewNote (change_set.User.Name, change_set.User.Email);
|
NewNote (change_set.User.Name, change_set.User.Email);
|
||||||
|
|
||||||
note_added = true;
|
note_added = true;
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (!note_added) {
|
if (!note_added) {
|
||||||
if (NewChangeSet != null)
|
if (NewChangeSet != null)
|
||||||
NewChangeSet (change_set);
|
NewChangeSet (change_set);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// There could be changes from a resolved
|
// There could be changes from a resolved
|
||||||
|
|
Loading…
Reference in a new issue