Fixed bug preventing current objective timer from stopping on char ch…

…ange
gwdevhub · Sep 19, 2024 · d197385 · d197385
1 parent f5c137f
commit d197385
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/GWToolboxdll/Windows/ObjectiveTimerWindow.cpp b/GWToolboxdll/Windows/ObjectiveTimerWindow.cpp
@@ -28,6 +28,7 @@
 #include <GWToolbox.h>
 #include <Utils/GuiUtils.h>
 #include <Logger.h>
+#include <GWCA/Context/CharContext.h>
 
 constexpr uint32_t TIME_UNKNOWN = std::numeric_limits<uint32_t>::max();
 unsigned int ObjectiveTimerWindow::ObjectiveSet::cur_ui_id = 0;
@@ -228,6 +229,8 @@ void ObjectiveTimerWindow::Initialize()
                                                                                  InstanceLoadInfo = new GW::Packet::StoC::InstanceLoadInfo;
                                                                                  memcpy(InstanceLoadInfo, packet, sizeof(GW::Packet::StoC::InstanceLoadInfo));
                                                                                  CheckIsMapLoaded();
+                                                                                 if (current_objective_set && current_objective_set->character_name != GW::GetCharContext()->player_name)
+                                                                                     StopObjectives();
                                                                              });
     GW::StoC::RegisterPostPacketCallback<GW::Packet::StoC::InstanceLoadFile>(
         &InstanceLoadFile_Entry, [this](GW::HookStatus*, const GW::Packet::StoC::InstanceLoadFile* packet) {
@@ -1430,6 +1433,7 @@ ObjectiveTimerWindow::ObjectiveSet::ObjectiveSet()
     system_time = static_cast<DWORD>(time(nullptr));
     run_start_time_point = TimerWidget::Instance().GetStartPoint() != TIME_UNKNOWN ? TimerWidget::Instance().GetStartPoint() : time_point_ms();
     duration = TIME_UNKNOWN;
+    character_name = GW::GetCharContext()->player_name;
 }
 
 ObjectiveTimerWindow::ObjectiveSet::~ObjectiveSet()

diff --git a/GWToolboxdll/Windows/ObjectiveTimerWindow.h b/GWToolboxdll/Windows/ObjectiveTimerWindow.h
@@ -162,6 +162,7 @@ class ObjectiveTimerWindow : public ToolboxWindow {
         DWORD run_start_time_point = 0;
         DWORD duration = static_cast<DWORD>(-1);
         DWORD GetDuration();
+        std::wstring character_name;
         const char* GetDurationStr();
         const char* GetStartTimeStr();