github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-06 04:52:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a log error, and made the ClipboardHotkey optional.

Browse source
This commit is contained in:
Robin Krom 2022-06-30 23:47:38 +02:00
parent bfa8e2444e
commit 2b5e45e33e
No known key found for this signature in database
GPG key ID: BCC01364F1371490
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Greenshot.Base/Core/ClipboardHelper.cs
View file

@ -520,7 +520,7 @@ EndSelection:<<<<<<<4
Bitmap singleImage = GetImage(dataObject); Bitmap singleImage = GetImage(dataObject);
if (singleImage != null) if (singleImage != null)
{ {
Log.InfoFormat($"Got {singleImage.GetType()} from clipboard with size {singleImage.Size}"); Log.Info($"Got {singleImage.GetType()} from clipboard with size {singleImage.Size}");
yield return singleImage; yield return singleImage;
yield break; yield break;
} }

2
src/Greenshot.Base/Core/CoreConfiguration.cs
View file

@ -59,7 +59,7 @@ namespace Greenshot.Base.Core
[IniProperty("IEHotkey", Description = "Hotkey for starting the IE capture", DefaultValue = "Shift + Ctrl + PrintScreen")] [IniProperty("IEHotkey", Description = "Hotkey for starting the IE capture", DefaultValue = "Shift + Ctrl + PrintScreen")]
public string IEHotkey { get; set; } public string IEHotkey { get; set; }
[IniProperty("ClipboardHotkey", Description = "Hotkey for opening the clipboard contents into the editor")] [IniProperty("ClipboardHotkey", Description = "Hotkey for opening the clipboard contents into the editor", ExcludeIfNull = true)]
public string ClipboardHotkey { get; set; } public string ClipboardHotkey { get; set; }
[IniProperty("IsFirstLaunch", Description = "Is this the first time launch?", DefaultValue = "true")] [IniProperty("IsFirstLaunch", Description = "Is this the first time launch?", DefaultValue = "true")]