RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-06 06:55:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve Restart function

Browse source 
Don't erase boot args
Should now work correctly with game launchers
This commit is contained in:
Nekotekina 2018-01-03 00:45:52 +03:00
parent 7050575fdb
commit af3e1fc580
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/rpcs3qt/main_window.cpp
View file

@ -172,7 +172,7 @@ void main_window::CreateThumbnailToolbar()
RepaintThumbnailIcons();
connect(m_thumb_stop, &QWinThumbnailToolButton::clicked, [=]() { Emu.Stop(); });
connect(m_thumb_restart, &QWinThumbnailToolButton::clicked, [=]() { Emu.SetForceBoot(true); Emu.Stop(); Emu.Load(); });
connect(m_thumb_restart, &QWinThumbnailToolButton::clicked, [=]() { Emu.Restart(); });
connect(m_thumb_playPause, &QWinThumbnailToolButton::clicked, Pause);
#endif
}
@ -1093,7 +1093,7 @@ void main_window::CreateConnects()
connect(ui->exitAct, &QAction::triggered, this, &QWidget::close);
connect(ui->sysPauseAct, &QAction::triggered, Pause);
connect(ui->sysStopAct, &QAction::triggered, [=]() { Emu.Stop(); });
connect(ui->sysRebootAct, &QAction::triggered, [=]() { Emu.SetForceBoot(true); Emu.Stop(); Emu.Load(); });
connect(ui->sysRebootAct, &QAction::triggered, [=]() { Emu.Restart(); });
connect(ui->sysSendOpenMenuAct, &QAction::triggered, [=]
{
@ -1515,7 +1515,7 @@ void main_window::keyPressEvent(QKeyEvent *keyEvent)
case Qt::Key_E: if (Emu.IsPaused()) Emu.Resume(); else if (Emu.IsReady()) Emu.Run(); return;
case Qt::Key_P: if (Emu.IsRunning()) Emu.Pause(); return;
case Qt::Key_S: if (!Emu.IsStopped()) Emu.Stop(); return;
case Qt::Key_R: if (!Emu.GetBoot().empty()) { Emu.SetForceBoot(true); Emu.Stop(); Emu.Run(); } return;
case Qt::Key_R: if (!Emu.GetBoot().empty()) Emu.Restart(); return;
}
}
}