Fixed a log error, and made the ClipboardHotkey optional.

greenshot · Jun 30, 2022 · 2b5e45e · 2b5e45e
1 parent bfa8e24
commit 2b5e45e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Greenshot.Base/Core/ClipboardHelper.cs b/src/Greenshot.Base/Core/ClipboardHelper.cs
@@ -520,7 +520,7 @@ public static IEnumerable<Bitmap> GetImages(IDataObject dataObject)
             Bitmap singleImage = GetImage(dataObject);
             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 break;
             }

diff --git a/src/Greenshot.Base/Core/CoreConfiguration.cs b/src/Greenshot.Base/Core/CoreConfiguration.cs
@@ -59,7 +59,7 @@ public class CoreConfiguration : IniSection, INotifyPropertyChanged
         [IniProperty("IEHotkey", Description = "Hotkey for starting the IE capture", DefaultValue = "Shift + Ctrl + PrintScreen")]
         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; }
 
         [IniProperty("IsFirstLaunch", Description = "Is this the first time launch?", DefaultValue = "true")]