fix statusicon
This commit is contained in:
parent
3d15c1fb97
commit
0688a65746
|
@ -100,7 +100,7 @@ namespace SparkleShare {
|
||||||
|
|
||||||
// Fetch remote changes every 20 seconds
|
// Fetch remote changes every 20 seconds
|
||||||
FetchTimer = new Timer ();
|
FetchTimer = new Timer ();
|
||||||
FetchTimer.Interval = 17500;
|
FetchTimer.Interval = 20000;
|
||||||
FetchTimer.Elapsed += delegate {
|
FetchTimer.Elapsed += delegate {
|
||||||
Fetch ();
|
Fetch ();
|
||||||
};
|
};
|
||||||
|
@ -111,6 +111,7 @@ namespace SparkleShare {
|
||||||
// Add everything that changed
|
// Add everything that changed
|
||||||
// since SparkleShare was stopped
|
// since SparkleShare was stopped
|
||||||
Add ();
|
Add ();
|
||||||
|
|
||||||
Console.WriteLine ("[Git][" + Name + "] Nothing going on...");
|
Console.WriteLine ("[Git][" + Name + "] Nothing going on...");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -156,9 +157,7 @@ namespace SparkleShare {
|
||||||
string Message = FormatCommitMessage ();
|
string Message = FormatCommitMessage ();
|
||||||
if (!Message.Equals ("")) {
|
if (!Message.Equals ("")) {
|
||||||
Commit (Message);
|
Commit (Message);
|
||||||
Push ();
|
|
||||||
Fetch ();
|
Fetch ();
|
||||||
// Push again in case of a conflict
|
|
||||||
Push ();
|
Push ();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue