From 16087f54b7d594d867864ffc731f2ba7633a1610 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 22 Jun 2020 19:39:31 +0300
Subject: New_GPG: fix for key deletion

---
 plugins/New_GPG/src/init.cpp | 2 +-
 plugins/New_GPG/src/ui.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index e327931e26..142603b7fe 100755
--- a/plugins/New_GPG/src/init.cpp
+++ b/plugins/New_GPG/src/init.cpp
@@ -138,7 +138,7 @@ int CMPlugin::Load()
 	HookEvent(ME_OPT_INITIALISE, GpgOptInit);
 	HookEvent(ME_PROTO_ACK, onProtoAck);
 	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
-	HookEvent(ME_SYSTEM_SHUTDOWN, OnShutdown);
+	HookEvent(ME_SYSTEM_PRESHUTDOWN, OnShutdown);
 
 	InitIconLib();
 	init_vars();
diff --git a/plugins/New_GPG/src/ui.cpp b/plugins/New_GPG/src/ui.cpp
index 3742d43b24..cd0960f8b9 100755
--- a/plugins/New_GPG/src/ui.cpp
+++ b/plugins/New_GPG/src/ui.cpp
@@ -364,7 +364,7 @@ void CDlgFirstRun::onClick_DELETE_KEY(CCtrlButton*)
 		s += mir_strlen("Key fingerprint = ");
 		int s2 = params.out.Find("\n", s);
 
-		CMStringW tmp = params.out.Mid(s, s2 - s - 1);
+		CMStringW tmp = params.out.Mid(s, s2 - s);
 		tmp.Remove(' ');
 
 		gpg_execution_params params2;
-- 
cgit v1.2.3