Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't bother resuming/pausing around savestates.

Browse source 
Only makes things more likely to crash.
This commit is contained in:
Unknown W. Brackets 2013-02-23 13:54:47 -08:00
parent 3dee0e0149
commit 8f9ea31a87
2 changed files with 0 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Qt/mainwindow.cpp
View file

@ -388,26 +388,10 @@ void SaveStateActionFinished(bool result, void *userdata)
msgBox.exec(); msgBox.exec();
return; return;
} }
MainWindow* mainWindow = (MainWindow*)userdata;
if (g_State.bEmuThreadStarted && mainWindow->GetNextState() == CORE_RUNNING)
{
if(mainWindow->GetDialogDisasm())
mainWindow->GetDialogDisasm()->Go();
}
} }
void MainWindow::on_action_FileLoadStateFile_triggered() void MainWindow::on_action_FileLoadStateFile_triggered()
{ {
if (g_State.bEmuThreadStarted)
{
nextState = Core_IsStepping() ? CORE_STEPPING : CORE_RUNNING;
if(dialogDisasm)
{
dialogDisasm->Stop();
}
}
QFileDialog dialog(0,"Load state"); QFileDialog dialog(0,"Load state");
dialog.setFileMode(QFileDialog::ExistingFile); dialog.setFileMode(QFileDialog::ExistingFile);
QStringList filters; QStringList filters;
@ -425,14 +409,6 @@ void MainWindow::on_action_FileLoadStateFile_triggered()
void MainWindow::on_action_FileSaveStateFile_triggered() void MainWindow::on_action_FileSaveStateFile_triggered()
{ {
if (g_State.bEmuThreadStarted)
{
nextState = Core_IsStepping() ? CORE_STEPPING : CORE_RUNNING;
if(dialogDisasm)
{
dialogDisasm->Stop();
}
}
QFileDialog dialog(0,"Save state"); QFileDialog dialog(0,"Save state");
dialog.setFileMode(QFileDialog::AnyFile); dialog.setFileMode(QFileDialog::AnyFile);
dialog.setAcceptMode(QFileDialog::AcceptSave); dialog.setAcceptMode(QFileDialog::AcceptSave);
@ -449,27 +425,11 @@ void MainWindow::on_action_FileSaveStateFile_triggered()
void MainWindow::on_action_FileQuickloadState_triggered() void MainWindow::on_action_FileQuickloadState_triggered()
{ {
if (g_State.bEmuThreadStarted)
{
nextState = Core_IsStepping() ? CORE_STEPPING : CORE_RUNNING;
if(dialogDisasm)
{
dialogDisasm->Stop();
}
}
SaveState::LoadSlot(0, SaveStateActionFinished, this); SaveState::LoadSlot(0, SaveStateActionFinished, this);
} }
void MainWindow::on_action_FileQuickSaveState_triggered() void MainWindow::on_action_FileQuickSaveState_triggered()
{ {
if (g_State.bEmuThreadStarted)
{
nextState = Core_IsStepping() ? CORE_STEPPING : CORE_RUNNING;
if(dialogDisasm)
{
dialogDisasm->Stop();
}
}
SaveState::SaveSlot(0, SaveStateActionFinished, this); SaveState::SaveSlot(0, SaveStateActionFinished, this);
} }

7
Windows/WndMainWindow.cpp
View file

@ -869,13 +869,6 @@ namespace MainWindow
if (!result) if (!result)
MessageBox(0, "Savestate failure. Please try again later.", "Sorry", MB_OK); MessageBox(0, "Savestate failure. Please try again later.", "Sorry", MB_OK);
SetCursor(LoadCursor(0, IDC_ARROW)); SetCursor(LoadCursor(0, IDC_ARROW));
if (g_State.bEmuThreadStarted && nextState == CORE_RUNNING)
{
for (int i=0; i<numCPUs; i++)
if (disasmWindow[i])
SendMessage(disasmWindow[i]->GetDlgHandle(), WM_COMMAND, IDC_GO, 0);
}
} }
void SetNextState(CoreState state) void SetNextState(CoreState state)