github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 21:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

Browse source
This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions
Download patch file Download diff file Expand all files Collapse all files

5
GreenshotPlugin/Core/AbstractDestination.cs
View file

@ -34,7 +34,7 @@ namespace GreenshotPlugin.Core {
/// </summary>
public abstract class AbstractDestination : IDestination {
private static readonly ILog LOG = LogManager.GetLogger(typeof(AbstractDestination));
private static CoreConfiguration configuration = IniConfig.GetIniSection<CoreConfiguration>();
private static readonly CoreConfiguration configuration = IniConfig.GetIniSection<CoreConfiguration>();
public virtual int CompareTo(object obj) {
IDestination other = obj as IDestination;
@ -312,7 +312,8 @@ namespace GreenshotPlugin.Core {
basisMenuItem.Click += destinationClickHandler;
if (isDynamic && addDynamics) {
basisMenuItem.DropDownOpening += delegate(object source, EventArgs eventArgs) {
basisMenuItem.DropDownOpening += delegate
{
if (basisMenuItem.DropDownItems.Count == 0) {
List<IDestination> subDestinations = new List<IDestination>();
// Fixing Bug #3536968 by catching the COMException (every exception) and not displaying the "subDestinations"