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

statusicon: add lock. attempt to fix #1130

Browse source
This commit is contained in:
Hylke Bons 2013-01-05 16:28:24 +01:00
parent 4be9ebe895
commit 72beb68a4c
2 changed files with 31 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SparkleShare/SparkleControllerBase.cs
View file

@ -262,7 +262,7 @@ namespace SparkleShare {
new Thread (() => {
string keys_path = Path.GetDirectoryName (SparkleConfig.DefaultConfig.FullPath);
string key_file_name = DateTime.Now.ToString ("yyyy-MM-dd_HH\\hmm"); // TODO: move to undercore name for old keys
string key_file_name = DateTime.Now.ToString ("yyyy-MM-dd_HH\\hmm");
string [] key_pair = SparkleKeys.GenerateKeyPair (keys_path, key_file_name);
SparkleKeys.ImportPrivateKey (key_pair [0]);

4
SparkleShare/SparkleStatusIconController.cs
View file

@ -248,8 +248,11 @@ namespace SparkleShare {
}
private Object folders_lock = new Object ();
private void UpdateFolders ()
{
lock (this.folders_lock) {
List<string> folders = new List<string> ();
List<string> folder_errors = new List<string> ();
@ -283,4 +286,5 @@ namespace SparkleShare {
FolderErrors = folder_errors.ToArray ();
}
}
}
}