controller: Don't show conflict conflict bubbles when notifications are disabled
This commit is contained in:
parent
448599e661
commit
6596c2a65f
|
@ -291,8 +291,9 @@ namespace SparkleShare {
|
|||
};
|
||||
|
||||
repo.ConflictResolved += delegate {
|
||||
AlertNotificationRaised ("Conflict detected",
|
||||
"Don't worry, SparkleShare made a copy of each conflicting file.");
|
||||
if (NotificationsEnabled)
|
||||
AlertNotificationRaised ("Conflict detected",
|
||||
"Don't worry, SparkleShare made a copy of each conflicting file.");
|
||||
};
|
||||
|
||||
this.repositories.Add (repo);
|
||||
|
|
Loading…
Reference in a new issue