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

This fixes a NPRE when an instance is already running.

Browse source
This commit is contained in:
Robin 2019-02-01 22:21:47 +01:00
commit 6f573ea304
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Greenshot/Startup.cs
View file

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