From e3583a113ac0165305ee4728fb01876254ec2f79 Mon Sep 17 00:00:00 2001
From: Exle <ddevim13@gmail.com>
Date: Sat, 14 Apr 2018 13:35:26 +0300
Subject: [PATCH] Fixed bugs when closing AIMP

---
 AIMPRemote.cpp           |  67 +++++++++++++++++++++------------------
 AIMPRemote.h             |   2 +-
 DiscordRPC.cpp           |   1 -
 aimp_DiscordPresence.cpp | Bin 6224 -> 6392 bytes
 4 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/AIMPRemote.cpp b/AIMPRemote.cpp
index 78bcef1..854f407 100644
--- a/AIMPRemote.cpp
+++ b/AIMPRemote.cpp
@@ -1,11 +1,10 @@
-#include <cmath>
 #include "AIMPRemote.h"
 
 AIMPRemote *AIMPRemote::PAIMPRemote;
 
 AIMPRemote::AIMPRemote()
 	: FAIMPRemoteHandle(NULL),
-	MyWnd(NULL)
+	  MyWnd(NULL)
 {
 	PAIMPRemote = this;
 	ARTrackInfo = { 0 };
@@ -16,15 +15,15 @@ AIMPRemote::AIMPRemote()
 
 AIMPRemote::~AIMPRemote()
 {
-	AIMPSetRemoteHandle(NULL);
+	if (FAIMPRemoteHandle)
+	{
+		DestroyWindow(FAIMPRemoteHandle);
+	}
 
-	if (MyWnd != NULL)
+	if (MyWnd)
 	{
 		DestroyWindow(MyWnd);
 	}
-
-	delete FAIMPRemoteHandle;
-	delete MyWnd;
 }
 
 VOID AIMPRemote::AIMPExecuteCommand(INT ACommand)
@@ -60,14 +59,14 @@ VOID AIMPRemote::AIMPSetEvents(AIMPEvents *Events)
 	PAIMPRemote->AREvents = *Events;
 }
 
-BOOL AIMPRemote::AIMPSetRemoteHandle(const HWND Value)
+BOOL AIMPRemote::AIMPSetRemoteHandle(const HWND *Value)
 {
-	if (PAIMPRemote->FAIMPRemoteHandle == Value)
+	if (PAIMPRemote->FAIMPRemoteHandle == *Value)
 	{
 		return true;
 	}
 
-	if (PAIMPRemote->FAIMPRemoteHandle)
+	if (PAIMPRemote->FAIMPRemoteHandle && PAIMPRemote->MyWnd)
 	{
 		SendMessage(PAIMPRemote->FAIMPRemoteHandle, WM_AIMP_COMMAND, AIMP_RA_CMD_UNREGISTER_NOTIFY, (LPARAM)PAIMPRemote->MyWnd);
 	}
@@ -90,7 +89,7 @@ BOOL AIMPRemote::AIMPSetRemoteHandle(const HWND Value)
 		}
 	}
 
-	PAIMPRemote->FAIMPRemoteHandle = Value;
+	PAIMPRemote->FAIMPRemoteHandle = *Value;
 
 	PAIMPRemote->InfoUpdateVersionInfo();
 	PAIMPRemote->InfoUpdatePlayerState();
@@ -109,6 +108,11 @@ BOOL AIMPRemote::AIMPSetRemoteHandle(const HWND Value)
 
 BOOL AIMPRemote::InfoUpdateTrackInfo()
 {
+	if (!AREvents.TrackInfo)
+	{
+		return true;
+	}
+
 	HANDLE hFile;
 	PAIMPRemoteFileInfo AIMPRemote_TrackInfo;
 	LPWSTR offset;
@@ -175,16 +179,18 @@ BOOL AIMPRemote::InfoUpdateTrackInfo()
 	UnmapViewOfFile(AIMPRemote_TrackInfo);
 	CloseHandle(hFile);
 
-	if (AREvents.TrackInfo != NULL)
-	{
-		AREvents.TrackInfo(&ARTrackInfo);
-	}
+	AREvents.TrackInfo(&ARTrackInfo);
 
 	return true;
 }
 
 BOOL AIMPRemote::InfoUpdatePlayerState()
 {
+	if (!AREvents.State)
+	{
+		return true;
+	}
+
 	int AIMPRemote_State = AIMPGetPropertyValue(AIMP_RA_PROPERTY_PLAYER_STATE);
 	if (ARState == AIMPRemote_State)
 	{
@@ -193,21 +199,23 @@ BOOL AIMPRemote::InfoUpdatePlayerState()
 
 	ARState = AIMPRemote_State;
 
-	if (AREvents.State != NULL)
-	{
-		AREvents.State(ARState);
-	}
+	AREvents.State(ARState);
 
 	return true;
 }
 
 BOOL AIMPRemote::InfoUpdateTrackPositionInfo()
 {
-	int AIMPRemote_PositionDur = (int)round(AIMPGetPropertyValue(AIMP_RA_PROPERTY_PLAYER_DURATION) / 1000);
-	int AIMPRemote_PositionPos = (int)round(AIMPGetPropertyValue(AIMP_RA_PROPERTY_PLAYER_POSITION) / 1000);
+	if (!AREvents.TrackPosition)
+	{
+		return true;
+	}
+
+	int AIMPRemote_PositionDur = AIMPGetPropertyValue(AIMP_RA_PROPERTY_PLAYER_DURATION) / 1000;
+	int AIMPRemote_PositionPos = AIMPGetPropertyValue(AIMP_RA_PROPERTY_PLAYER_POSITION) / 1000;
 
 	if (ARPosition.Duration == AIMPRemote_PositionDur
-		&& ARPosition.Position == AIMPRemote_PositionPos)
+	&&	ARPosition.Position == AIMPRemote_PositionPos)
 	{
 		return false;
 	}
@@ -215,26 +223,25 @@ BOOL AIMPRemote::InfoUpdateTrackPositionInfo()
 	ARPosition.Duration = AIMPRemote_PositionDur;
 	ARPosition.Position = AIMPRemote_PositionPos;
 
-	if (AREvents.TrackPosition != NULL)
-	{
-		AREvents.TrackPosition(&ARPosition);
-	}
+	AREvents.TrackPosition(&ARPosition);
 
 	return true;
 }
 
 BOOL AIMPRemote::InfoUpdateVersionInfo()
 {
+	if (!AREvents.Version)
+	{
+		return true;
+	}
+
 	int AIMPRemote_Version = AIMPGetPropertyValue(AIMP_RA_PROPERTY_VERSION);
 	if (AIMPRemote_Version != 0)
 	{
 		ARVersion.Version = static_cast<float>(HIWORD(AIMPRemote_Version)) / 100;
 		ARVersion.Build = LOWORD(AIMPRemote_Version);
 
-		if (AREvents.Version != NULL)
-		{
-			AREvents.Version(&ARVersion);
-		}
+		AREvents.Version(&ARVersion);
 
 		return true;
 	}
diff --git a/AIMPRemote.h b/AIMPRemote.h
index cf5c6b3..fd7c852 100644
--- a/AIMPRemote.h
+++ b/AIMPRemote.h
@@ -63,7 +63,7 @@ class AIMPRemote
 	static INT AIMPGetPropertyValue(INT APropertyID);
 	static BOOL AIMPSetPropertyValue(INT APropertyID, INT AValue);
 	static VOID AIMPSetEvents(AIMPEvents *Events);
-	static BOOL AIMPSetRemoteHandle(const HWND Value);
+	static BOOL AIMPSetRemoteHandle(const HWND *Value);
 protected:
 	static LRESULT CALLBACK WMAIMPNotify(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 private:
diff --git a/DiscordRPC.cpp b/DiscordRPC.cpp
index 2cbc170..766a1fd 100644
--- a/DiscordRPC.cpp
+++ b/DiscordRPC.cpp
@@ -8,7 +8,6 @@ DiscordRPC::DiscordRPC()
 
 DiscordRPC::~DiscordRPC()
 {
-	ClearPresence();
 	Shutdown();
 }
 
diff --git a/aimp_DiscordPresence.cpp b/aimp_DiscordPresence.cpp
index e84f9ec1bef7ef3d1e9ddde8f54d201b661b9186..3224ca9e8dd035319bf297f81d90db588a59d554 100644
GIT binary patch
delta 162
zcmca$@WXI}3y&-(LkdGGLk<v^0I>pt8iOlC8IY9+<QGrw=at_a!*hy}QEjq3v*Knq
zz6K^<MWBvMhGK?fhJ1#i$)22wyw(i73|tJH47DJ7^L7DqHt|e`G@xM`$V!21&B={|
e%9F$`CYy<0<K$$hhUl9tC}A!H)eSQRXchox=^!cq

delta 63
zcmV-F0KotFG0-ruL=3ZN4B`QkAOj$?Yz}||vo;YZ29q`v4wDcP1e2H-IFr&B)RXuT
V9FxEi8k67{1_*rs4FC!NeE`D+6fXb(