archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 17:58:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

idm->g_fxo

Browse source
This commit is contained in:
trigger 2025-04-30 15:11:38 -07:00
parent ded9d73ce4
commit ede12f65c5
2 changed files with 34 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
rpcs3/rpcs3qt/memory_viewer_panel.cpp
View file

@ -9,6 +9,7 @@
#include "Emu/RSX/RSXThread.h" #include "Emu/RSX/RSXThread.h"
#include "Emu/RSX/rsx_utils.h" #include "Emu/RSX/rsx_utils.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/System.h"
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QPushButton> #include <QPushButton>
#include <QSpinBox> #include <QSpinBox>
@ -589,6 +590,14 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
idm::remove_verify<memory_viewer_handle>(id, handle_ptr); idm::remove_verify<memory_viewer_handle>(id, handle_ptr);
}); });
if (!g_fxo->try_get<memory_viewer_fxo>())
{
g_fxo->init<memory_viewer_fxo>();
}
auto& fxo = g_fxo->get<memory_viewer_fxo>();
fxo.last_opened = this;
} }
memory_viewer_panel::~memory_viewer_panel() memory_viewer_panel::~memory_viewer_panel()
@ -1247,20 +1256,23 @@ void memory_viewer_panel::ShowImage(QWidget* parent, u32 addr, color_format form
void memory_viewer_panel::ShowAtPC(u32 pc) void memory_viewer_panel::ShowAtPC(u32 pc)
{ {
const u32 id = idm::last_id(); if (Emu.IsStopped())
auto handle_ptr = idm::get_unlocked<memory_viewer_handle>(id); return;
if (!handle_ptr) if (const auto* fxo = g_fxo->try_get<memory_viewer_fxo>())
{ {
idm::make<memory_viewer_handle>(nullptr, nullptr, pc); if (auto* panel = fxo->last_opened)
{
panel->SetPC(pc);
panel->raise();
panel->scroll(0);
if (!panel->isVisible())
{
panel->show();
}
return; return;
} }
handle_ptr->m_mvp->SetPC(pc);
handle_ptr->m_mvp->raise();
handle_ptr->m_mvp->scroll(0);
if (!handle_ptr->m_mvp->isVisible())
{
handle_ptr->m_mvp->show();
} }
idm::make<memory_viewer_handle>(nullptr, nullptr, pc);
} }

9
rpcs3/rpcs3qt/memory_viewer_panel.h
View file

@ -139,3 +139,12 @@ struct memory_viewer_handle
public: public:
const std::add_pointer_t<memory_viewer_panel> m_mvp; const std::add_pointer_t<memory_viewer_panel> m_mvp;
}; };
struct memory_viewer_fxo
{
memory_viewer_panel* last_opened = nullptr;
memory_viewer_fxo() = default;
memory_viewer_fxo(const memory_viewer_fxo&) = delete;
memory_viewer_fxo& operator=(const memory_viewer_fxo&) = delete;
};