Merge branch 'master' into about
This commit is contained in:
commit
ce3ddd919e
|
@ -277,8 +277,13 @@ namespace SparkleLib {
|
||||||
|
|
||||||
public bool IdentifierExists (string identifier)
|
public bool IdentifierExists (string identifier)
|
||||||
{
|
{
|
||||||
|
if (identifier == null)
|
||||||
|
throw new ArgumentNullException ();
|
||||||
|
|
||||||
foreach (XmlNode node_folder in SelectNodes ("/sparkleshare/folder")) {
|
foreach (XmlNode node_folder in SelectNodes ("/sparkleshare/folder")) {
|
||||||
if (node_folder ["identifier"].InnerText.Equals (identifier))
|
XmlElement folder_id = node_folder ["identifier"];
|
||||||
|
|
||||||
|
if (folder_id != null && identifier.Equals (folder_id.InnerText))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -178,7 +178,7 @@ namespace SparkleShare {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
Controller.UpdateChooserEvent += delegate (SparkleFolder [] folders) {
|
Controller.UpdateChooserEvent += delegate (string [] folders) {
|
||||||
Dispatcher.BeginInvoke ((Action) delegate {
|
Dispatcher.BeginInvoke ((Action) delegate {
|
||||||
UpdateChooser (folders);
|
UpdateChooser (folders);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue