From ccf814bcd0253b6320d598d0f258dda9106083f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Tue, 28 Jan 2025 13:25:05 +0100
Subject: [PATCH] Some shutdown logging improvements

---
 Common/Net/HTTPClient.cpp  |  4 ++--
 Core/RetroAchievements.cpp | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Common/Net/HTTPClient.cpp b/Common/Net/HTTPClient.cpp
index f3608ebe04..83509bab62 100644
--- a/Common/Net/HTTPClient.cpp
+++ b/Common/Net/HTTPClient.cpp
@@ -159,7 +159,7 @@ bool Connection::Connect(int maxTries, double timeout, bool *cancelConnect) {
 
 			selectResult = select(maxfd, nullptr, &fds, nullptr, &tv);
 			if (cancelConnect && *cancelConnect) {
-				WARN_LOG(Log::HTTP, "connect: cancelled (1)");
+				WARN_LOG(Log::HTTP, "connect: cancelled (1): %s:%d", host_.c_str(), port_);
 				break;
 			}
 		}
@@ -183,7 +183,7 @@ bool Connection::Connect(int maxTries, double timeout, bool *cancelConnect) {
 		}
 
 		if (cancelConnect && *cancelConnect) {
-			WARN_LOG(Log::HTTP, "connect: cancelled (2)");
+			WARN_LOG(Log::HTTP, "connect: cancelled (2): %s:%d", host_.c_str(), port_);
 			break;
 		}
 
diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp
index 6aaaad0a64..1d71a95513 100644
--- a/Core/RetroAchievements.cpp
+++ b/Core/RetroAchievements.cpp
@@ -746,16 +746,20 @@ void UpdateSettings() {
 
 bool Shutdown() {
 	g_activeChallenges.clear();
+	if (g_rcClient) {
 #ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION
-	rc_client_unload_raintegration(g_rcClient);
+		rc_client_unload_raintegration(g_rcClient);
 #endif
-	rc_client_destroy(g_rcClient);
-	g_rcClient = nullptr;
-	INFO_LOG(Log::Achievements, "Achievements shut down.");
+		rc_client_destroy(g_rcClient);
+		g_rcClient = nullptr;
+		INFO_LOG(Log::Achievements, "Achievements shut down.");
+	}
 	return true;
 }
 
 void ResetRuntime() {
+	if (!g_rcClient)
+		return;
 	INFO_LOG(Log::Achievements, "Resetting rcheevos state...");
 	rc_client_reset(g_rcClient);
 	g_activeChallenges.clear();