From 6f573ea304af5871c0c857c386d0609f48bca021 Mon Sep 17 00:00:00 2001
From: Robin <robin@dapplo.net>
Date: Fri, 1 Feb 2019 22:21:47 +0100
Subject: [PATCH] This fixes a NPRE when an instance is already running.

---
 src/Greenshot/Startup.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Greenshot/Startup.cs b/src/Greenshot/Startup.cs
index 33474b064..4003b3f47 100644
--- a/src/Greenshot/Startup.cs
+++ b/src/Greenshot/Startup.cs
@@ -31,6 +31,7 @@ using Autofac;
 using Autofac.Features.OwnedInstances;
 using Caliburn.Micro;
 using Dapplo.Addons.Bootstrapper;
+using Dapplo.Addons.Bootstrapper.Resolving;
 using Dapplo.CaliburnMicro.Dapp;
 using Dapplo.Config.Ini.Converters;
 using Dapplo.Config.Language;
@@ -169,6 +170,7 @@ namespace Greenshot
                 process.Dispose();
             }
 
+            var greenshotResources = new GreenshotResources(new ManifestResources(null));
             // Placehold for the Extension
             IGreenshotLanguage language = null;
 
@@ -177,7 +179,7 @@ namespace Greenshot
             {
 
                 // TODO: Fix a problem that in this case instance is null 
-                Icon = GreenshotResources.Instance.GetGreenshotIcon(),
+                Icon = greenshotResources.GetGreenshotIcon(),
                 ShowInTaskbar = true,
                 MaximizeBox = false,
                 MinimizeBox = false,