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

Fix crash in memory viewer launcher (#17152)

Browse source
This commit is contained in:
Elad 2025-05-03 18:34:42 +03:00 • committed by GitHub
parent 75b728be7e
commit cf1e53f9c8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/rpcs3qt/instruction_editor_dialog.cpp
View file

@ -22,7 +22,7 @@ instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, C
: QDialog(parent)
, m_pc(_pc)
, m_disasm(_disasm->copy_type_erased())
, m_get_cpu(std::move(func))
, m_get_cpu(func ? std::move(func) : std::function<cpu_thread*()>(FN(nullptr)))
{
setWindowTitle(tr("Edit instruction"));
setAttribute(Qt::WA_DeleteOnClose);

2
rpcs3/rpcs3qt/memory_viewer_panel.cpp
View file

@ -35,7 +35,7 @@ constexpr auto qstr = QString::fromStdString;
memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDisAsm> disasm, u32 addr, std::function<cpu_thread*()> func)
: QDialog(parent)
, m_addr(addr)
, m_get_cpu(std::move(func))
, m_get_cpu(func ? std::move(func) : std::function<cpu_thread*()>(FN(nullptr)))
, m_type([&]()
{
const auto cpu = m_get_cpu();

2
rpcs3/rpcs3qt/register_editor_dialog.cpp
View file

@ -62,7 +62,7 @@ enum registers : int
register_editor_dialog::register_editor_dialog(QWidget *parent, CPUDisAsm* _disasm, std::function<cpu_thread*()> func)
: QDialog(parent)
, m_disasm(_disasm)
, m_get_cpu(std::move(func))
, m_get_cpu(func ? std::move(func) : std::function<cpu_thread*()>(FN(nullptr)))
{
setWindowTitle(tr("Edit registers"));
setAttribute(Qt::WA_DeleteOnClose);