From 9ea32d2e822cbd97d871f5a56f42bdb7293d1960 Mon Sep 17 00:00:00 2001 From: Charles Milette Date: Fri, 16 Nov 2018 13:24:52 -0500 Subject: [PATCH] Fix crashes when starting and closing --- ShareX/Forms/MainForm.cs | 2 +- ShareX/Program.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 5ce204299..1538a1861 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -302,7 +302,7 @@ protected override void WndProc(ref Message m) { if (m.Msg == (int)WindowsMessages.QUERYENDSESSION) { - EndSessionReasons reason = (EndSessionReasons)m.LParam; + EndSessionReasons reason = (EndSessionReasons)(m.LParam.ToInt64() & 0xFFFFFFFF); if (reason.HasFlag(EndSessionReasons.ENDSESSION_CLOSEAPP)) { // Register for restart. This allows our application to automatically restart when it is installing an update from the Store. diff --git a/ShareX/Program.cs b/ShareX/Program.cs index 717c66865..17f6e4d5a 100644 --- a/ShareX/Program.cs +++ b/ShareX/Program.cs @@ -287,7 +287,7 @@ private static void Run() SilentRun = CLI.IsCommandExist("silent", "s"); #if WindowsStore - SilentRun = SilentRun || AppInstance.GetActivatedEventArgs().Kind == ActivationKind.StartupTask; + SilentRun = SilentRun || AppInstance.GetActivatedEventArgs()?.Kind == ActivationKind.StartupTask; #endif #if STEAM