fix #5

fix #6

AIMPRemote.cpp

@@ -155,26 +155,32 @@ BOOL AIMPRemote::InfoUpdateTrackInfo()
 	memcpy(buffer, offset, AIMPRemote_TrackInfo->AlbumLength * 2);
 	buffer[AIMPRemote_TrackInfo->AlbumLength] = 0;
 	WideCharToMultiByte(CP_UTF8, NULL, buffer, -1, ARTrackInfo.Album,		sizeof(ARTrackInfo.Album), NULL, NULL);
+	if(strlen(ARTrackInfo.Album)==1)strcat_s(ARTrackInfo.Album, sizeof(ARTrackInfo.Album), " ");
 
 	memcpy(buffer, offset += AIMPRemote_TrackInfo->AlbumLength, AIMPRemote_TrackInfo->ArtistLength * 2);
 	buffer[AIMPRemote_TrackInfo->ArtistLength] = 0;
 	WideCharToMultiByte(CP_UTF8, NULL, buffer, -1, ARTrackInfo.Artist,		sizeof(ARTrackInfo.Artist), NULL, NULL);
+	if(strlen(ARTrackInfo.Album)==1)strcat_s(ARTrackInfo.Artist, sizeof(ARTrackInfo.Artist), " ");
 
 	memcpy(buffer, offset += AIMPRemote_TrackInfo->ArtistLength, AIMPRemote_TrackInfo->DateLength * 2);
 	buffer[AIMPRemote_TrackInfo->DateLength] = 0;
 	WideCharToMultiByte(CP_UTF8, NULL, buffer, -1, ARTrackInfo.Date,		sizeof(ARTrackInfo.Date), NULL, NULL);
+	if(strlen(ARTrackInfo.Album)==1)strcat_s(ARTrackInfo.Date, sizeof(ARTrackInfo.Date), " ");
 
 	memcpy(buffer, offset += AIMPRemote_TrackInfo->DateLength, AIMPRemote_TrackInfo->FileNameLength * 2);
 	buffer[AIMPRemote_TrackInfo->FileNameLength] = 0;
 	WideCharToMultiByte(CP_UTF8, NULL, buffer, -1, ARTrackInfo.FileName,	sizeof(ARTrackInfo.FileName), NULL, NULL);
+	if(strlen(ARTrackInfo.Album)==1)strcat_s(ARTrackInfo.FileName, sizeof(ARTrackInfo.FileName), " ");
 
 	memcpy(buffer, offset += AIMPRemote_TrackInfo->FileNameLength, AIMPRemote_TrackInfo->GenreLength * 2);
 	buffer[AIMPRemote_TrackInfo->GenreLength] = 0;
 	WideCharToMultiByte(CP_UTF8, NULL, buffer, -1, ARTrackInfo.Genre,		sizeof(ARTrackInfo.Genre), NULL, NULL);
+	if(strlen(ARTrackInfo.Album)==1)strcat_s(ARTrackInfo.Genre, sizeof(ARTrackInfo.Genre), " ");
 
 	memcpy(buffer, offset += AIMPRemote_TrackInfo->GenreLength, AIMPRemote_TrackInfo->TitleLength * 2);
 	buffer[AIMPRemote_TrackInfo->TitleLength] = 0;
 	WideCharToMultiByte(CP_UTF8, NULL, buffer, -1, ARTrackInfo.Title,		sizeof(ARTrackInfo.Title), NULL, NULL);
+	if(strlen(ARTrackInfo.Album)==1)strcat_s(ARTrackInfo.Title, sizeof(ARTrackInfo.Title), " ");
 
 	UnmapViewOfFile(AIMPRemote_TrackInfo);
 	CloseHandle(hFile);

DiscordRPC.cpp

@@ -33,22 +33,7 @@ BOOL DiscordRPC::Update(DiscordRichPresence *richPresence)
 {
 	if (b_init == true)
 	{
-		rich.state			= richPresence->state;
-		rich.details		= richPresence->details;
-		rich.startTimestamp	= richPresence->startTimestamp;
-		rich.endTimestamp	= richPresence->endTimestamp;
-		rich.largeImageKey	= richPresence->largeImageKey;
-		rich.largeImageText	= richPresence->largeImageText;
-		rich.smallImageKey	= richPresence->smallImageKey;
-		rich.smallImageText	= richPresence->smallImageText;
-		rich.partyId		= richPresence->partyId;
-		rich.partySize		= richPresence->partySize;
-		rich.partyMax		= richPresence->partyMax;
-		rich.matchSecret	= richPresence->matchSecret;
-		rich.joinSecret		= richPresence->joinSecret;
-		rich.spectateSecret	= richPresence->spectateSecret;
-		rich.instance		= richPresence->instance;
-
+		UpdateRP(richPresence);
 		Discord_UpdatePresence(&rich);
 		return true;
 	}