From b445db57528e056f1d152dd0664771b9eddee58f Mon Sep 17 00:00:00 2001
From: casey langen <casey.langen@gmail.com>
Date: Wed, 23 Dec 2020 10:39:59 -0800
Subject: [PATCH] Distinguish between win32 and win64 in HttpClient's user
 agent.

---
 CHANGELOG.txt                          |  6 ++++--
 src/musikcore/sdk/HttpClient.h         | 10 ++++++----
 src/musikcore/version.h                |  4 +++-
 src/musikcube/app/util/UpdateCheck.cpp |  4 +++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index eb0584079..7e928aed7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,9 +5,11 @@
 * fixed a bug that was preventing the update check from displaying a dialog on
   completion.
 * fixed now playing readout ellipsizing.
-* fixed a bug where last.fm scrobbles may get posted twice per track.
-* added a hotkey to clear the play queue; press 'shift+x' in the play queue
+* fixed a bug where `last.fm` scrobbles may get posted twice per track.
+* added a hotkey to clear the play queue; press `shift+x` in the play queue
   window.
+* fixed `HttpClient` user agent to distinguish between `win32` and `win64`
+
 --------------------------------------------------------------------------------
 
 0.96.2
diff --git a/src/musikcore/sdk/HttpClient.h b/src/musikcore/sdk/HttpClient.h
index 5154854bc..0dd111e3d 100644
--- a/src/musikcore/sdk/HttpClient.h
+++ b/src/musikcore/sdk/HttpClient.h
@@ -106,7 +106,7 @@ namespace musik { namespace core { namespace sdk {
             HttpHeaders requestHeaders, responseHeaders;
             HeaderCallback headersCb;
             DecoratorCallback decoratorCb;
-            CanceledCallback canceledCallback;
+            CanceledCallback canceledCb;
             bool cancel;
             Thread mode{ Thread::Background };
             HttpMethod method{ HttpMethod::Get };
@@ -115,7 +115,9 @@ namespace musik { namespace core { namespace sdk {
 
     template <typename T>
     std::string HttpClient<T>::DefaultUserAgent() {
-#ifdef WIN32
+#ifdef _WIN64
+        static const std::string PLATFORM = "win64";
+#elif WIN32
         static const std::string PLATFORM = "win32";
 #elif defined __APPLE__
         static const std::string PLATFORM = "macos";
@@ -316,8 +318,8 @@ namespace musik { namespace core { namespace sdk {
         curl_easy_getinfo(this->curl, CURLINFO_RESPONSE_CODE, &httpStatus);
 
         if (this->cancel) {
-            if (this->canceledCallback) {
-                this->canceledCallback(this);
+            if (this->canceledCb) {
+                this->canceledCb(this);
             }
         }
 
diff --git a/src/musikcore/version.h b/src/musikcore/version.h
index 13916cfa6..db0c5d989 100644
--- a/src/musikcore/version.h
+++ b/src/musikcore/version.h
@@ -45,7 +45,9 @@
 namespace musik {
     namespace cube {
         static inline std::string userAgent() {
-#ifdef WIN32
+#ifdef _WIN64
+            static const std::string PLATFORM = "win64";
+#elif WIN32
             static const std::string PLATFORM = "win32";
 #elif defined __APPLE__
             static const std::string PLATFORM = "macos";
diff --git a/src/musikcube/app/util/UpdateCheck.cpp b/src/musikcube/app/util/UpdateCheck.cpp
index ac9d835ef..4f8cd9582 100644
--- a/src/musikcube/app/util/UpdateCheck.cpp
+++ b/src/musikcube/app/util/UpdateCheck.cpp
@@ -61,7 +61,9 @@ static const std::string MINOR = "minor";
 static const std::string PATCH = "patch";
 static const std::string URL = "url";
 
-#ifdef WIN32
+#ifdef _WIN64
+static const std::string PLATFORM = "win64";
+#elif WIN32
 static const std::string PLATFORM = "win32";
 #elif defined __APPLE__
 static const std::string PLATFORM = "macos";