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

memory viewer: Close all instances after emulation exit

Browse source
This commit is contained in:
Eladash 2021-01-12 20:56:36 +02:00 • committed by Ivan
parent 923fcc3b3d
commit e05f1c37ad
4 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rpcs3/rpcs3qt/debugger_frame.cpp
View file

@ -320,8 +320,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event)
case Qt::Key_M: case Qt::Key_M:
{ {
// Memory viewer // Memory viewer
auto mvp = new memory_viewer_panel(this, pc, cpu); idm::make<memory_viewer_handle>(this, pc, cpu);
mvp->show();
return; return;
} }
case Qt::Key_F10: case Qt::Key_F10:

4
rpcs3/rpcs3qt/main_window.cpp
View file

@ -1839,8 +1839,8 @@ void main_window::CreateConnects()
connect(ui->toolsmemory_viewerAct, &QAction::triggered, [this] connect(ui->toolsmemory_viewerAct, &QAction::triggered, [this]
{ {
memory_viewer_panel* mvp = new memory_viewer_panel(this); if (!Emu.IsStopped())
mvp->show(); idm::make<memory_viewer_handle>(this);
}); });
connect(ui->toolsRsxDebuggerAct, &QAction::triggered, [this] connect(ui->toolsRsxDebuggerAct, &QAction::triggered, [this]

10
rpcs3/rpcs3qt/memory_viewer_panel.cpp
View file

@ -30,7 +30,6 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, u32 addr, const std::s
setWindowTitle(m_type != thread_type::spu ? tr("Memory Viewer") : tr("Memory Viewer Of %0").arg(qstr(cpu->get_name()))); setWindowTitle(m_type != thread_type::spu ? tr("Memory Viewer") : tr("Memory Viewer Of %0").arg(qstr(cpu->get_name())));
setObjectName("memory_viewer"); setObjectName("memory_viewer");
setAttribute(Qt::WA_DeleteOnClose);
m_colcount = 4; m_colcount = 4;
m_rowcount = 16; m_rowcount = 16;
int pSize = 10; int pSize = 10;
@ -260,6 +259,15 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, u32 addr, const std::s
}); });
setFixedWidth(sizeHint().width()); setFixedWidth(sizeHint().width());
// Show by default
show();
// Expected to be created by IDM, emulation stop will close it
connect(this, &memory_viewer_panel::finished, [id = idm::last_id()](int)
{
idm::remove<memory_viewer_handle>(id);
});
} }
memory_viewer_panel::~memory_viewer_panel() memory_viewer_panel::~memory_viewer_panel()

19
rpcs3/rpcs3qt/memory_viewer_panel.h
View file

@ -70,3 +70,22 @@ private:
void ShowImage(QWidget* parent, u32 addr, color_format format, u32 sizex, u32 sizey, bool flipv); void ShowImage(QWidget* parent, u32 addr, color_format format, u32 sizex, u32 sizey, bool flipv);
}; };
// Lifetime management with IDM
struct memory_viewer_handle
{
static constexpr u32 id_base = 1;
static constexpr u32 id_step = 1;
static constexpr u32 id_count = 2048;
template <typename... Args>
memory_viewer_handle(Args&&... args)
: m_mvp(new memory_viewer_panel(std::forward<Args>(args)...))
{
}
~memory_viewer_handle() { m_mvp->deleteLater(); }
private:
const std::add_pointer_t<memory_viewer_panel> m_mvp;
};