mirror of
https://github.com/greenshot/greenshot
synced 2025-08-20 21:43:24 -07:00
Merge af0560ad2c
into c1ad1d4a93
This commit is contained in:
commit
5056f370d2
1 changed files with 5 additions and 5 deletions
|
@ -28,7 +28,7 @@ using System.Drawing.Imaging;
|
|||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Runtime.Serialization.Formatters.Binary;
|
||||
using System.ServiceModel.Security;
|
||||
using System.ServiceModel.Security;
|
||||
using System.Windows.Forms;
|
||||
using Dapplo.Windows.Common.Extensions;
|
||||
using Dapplo.Windows.Common.Structs;
|
||||
|
@ -41,7 +41,7 @@ using Greenshot.Base.Interfaces.Drawing;
|
|||
using Greenshot.Base.Interfaces.Drawing.Adorners;
|
||||
using Greenshot.Editor.Configuration;
|
||||
using Greenshot.Editor.Drawing.Fields;
|
||||
using Greenshot.Editor.Helpers;
|
||||
using Greenshot.Editor.Helpers;
|
||||
using Greenshot.Editor.Memento;
|
||||
using log4net;
|
||||
|
||||
|
@ -734,9 +734,9 @@ namespace Greenshot.Editor.Drawing
|
|||
SelectElements(loadedElements);
|
||||
FieldAggregator.BindElements(loadedElements);
|
||||
}
|
||||
catch (SecurityAccessDeniedException)
|
||||
{
|
||||
throw;
|
||||
catch (SecurityAccessDeniedException)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue