Compare commits

...
2 Commits
2 changed files with 10 additions and 4 deletions
+5 -2
View File
@@ -3732,8 +3732,6 @@ void MainWindow::doDiscChange(CDVD_SourceType source, const QString& path)
reset_system = (message.clickedButton() == reset_button);
}
switchToEmulationView();
g_emu_thread->changeDisc(source, path);
if (reset_system)
{
@@ -3743,6 +3741,11 @@ void MainWindow::doDiscChange(CDVD_SourceType source, const QString& path)
else
g_emu_thread->resetVM();
}
// We have to do this after resetting the VM, otherwise the reset would be
// deferred since the VM would be running, and then VMLock::~VMLock would
// trample the reset state with its unpause event.
switchToEmulationView();
}
MainWindow::VMLock MainWindow::pauseAndLockVM()
+5 -2
View File
@@ -2254,8 +2254,11 @@ void GSDeviceVK::Destroy()
m_swap_chain.reset();
DestroySpinResources();
DestroyResources();
if (m_device != VK_NULL_HANDLE)
{
DestroySpinResources();
DestroyResources();
}
VKShaderCache::Destroy();