repo git: only disable emable watching once
This commit is contained in:
parent
39394de3bc
commit
a941bd3b80
|
@ -230,13 +230,11 @@ namespace SparkleLib {
|
||||||
|
|
||||||
if (git.ExitCode != 0) {
|
if (git.ExitCode != 0) {
|
||||||
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected. Trying to get out...");
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected. Trying to get out...");
|
||||||
DisableWatching ();
|
|
||||||
|
|
||||||
while (AnyDifferences)
|
while (AnyDifferences)
|
||||||
ResolveConflict ();
|
ResolveConflict ();
|
||||||
|
|
||||||
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved.");
|
SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved.");
|
||||||
EnableWatching ();
|
|
||||||
|
|
||||||
OnConflictResolved ();
|
OnConflictResolved ();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue