summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorLillyJadeKatrin <lilly.kitty.1988@gmail.com>2023-06-02 23:38:33 -0400
committerLillyJadeKatrin <lilly.kitty.1988@gmail.com>2023-06-03 09:15:40 -0400
commit60350635b657af2a03e56b5903295f554d746cb2 (patch)
tree12a6e60ff0ecfefc2b9db332d3f8d43774e924b1 /Source/Core
parent7bbd530eb5046bd218636d9b6ba0b7c318a09e55 (diff)
Fixed Rich Presence bugs
Refactored the Rich Presence two-minute trigger to clean it up and fix it.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/AchievementManager.cpp12
-rw-r--r--Source/Core/Core/AchievementManager.h3
2 files changed, 11 insertions, 4 deletions
diff --git a/Source/Core/Core/AchievementManager.cpp b/Source/Core/Core/AchievementManager.cpp
index 544af23368..b357e37466 100644
--- a/Source/Core/Core/AchievementManager.cpp
+++ b/Source/Core/Core/AchievementManager.cpp
@@ -176,6 +176,8 @@ void AchievementManager::LoadGameByFilenameAsync(const std::string& iso_path,
}
ActivateDeactivateLeaderboards();
ActivateDeactivateRichPresence();
+ // Reset this to zero so that RP immediately triggers on the first frame
+ m_last_ping_time = 0;
callback(fetch_game_data_response);
});
@@ -255,9 +257,13 @@ void AchievementManager::DoFrame()
});
if (!m_system)
return;
- u64 current_time = m_system->GetCoreTiming().GetTicks();
- if (current_time - m_last_ping_time > SystemTimers::GetTicksPerSecond() * 120)
- m_queue.EmplaceItem([this] { PingRichPresence(GenerateRichPresence()); });
+ time_t current_time = std::time(nullptr);
+ if (difftime(current_time, m_last_ping_time) > 120)
+ {
+ RichPresence rp = GenerateRichPresence();
+ m_queue.EmplaceItem([this, rp] { PingRichPresence(rp); });
+ m_last_ping_time = current_time;
+ }
}
u32 AchievementManager::MemoryPeeker(u32 address, u32 num_bytes, void* ud)
diff --git a/Source/Core/Core/AchievementManager.h b/Source/Core/Core/AchievementManager.h
index 8e01b9220e..f35cd5f659 100644
--- a/Source/Core/Core/AchievementManager.h
+++ b/Source/Core/Core/AchievementManager.h
@@ -5,6 +5,7 @@
#ifdef USE_RETRO_ACHIEVEMENTS
#include <array>
+#include <ctime>
#include <functional>
#include <mutex>
#include <string>
@@ -109,7 +110,7 @@ private:
u32 m_game_id = 0;
rc_api_fetch_game_data_response_t m_game_data{};
bool m_is_game_loaded = false;
- u64 m_last_ping_time = 0;
+ time_t m_last_ping_time = 0;
struct UnlockStatus
{