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

Don't use std::exit during Qt initialization

Browse source
This commit is contained in:
Megamouse 2021-02-05 15:36:57 +01:00
parent 7ce835e878
commit 2865865382
12 changed files with 62 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rpcs3/rpcs3qt/emu_settings.cpp
View file

@ -63,13 +63,27 @@ namespace
emu_settings::emu_settings()
: QObject()
, m_render_creator(new render_creator(this))
{
}
emu_settings::~emu_settings()
{
}
bool emu_settings::Init()
{
m_render_creator = new render_creator(this);
if (!m_render_creator)
{
fmt::throw_exception("emu_settings::emu_settings() render_creator is null");
}
if (m_render_creator->abort_requested)
{
return false;
}
// Make Vulkan default setting if it is supported
if (m_render_creator->Vulkan.supported && !m_render_creator->Vulkan.adapters.empty())
{
@ -78,10 +92,8 @@ emu_settings::emu_settings()
Emu.SetDefaultRenderer(video_renderer::vulkan);
Emu.SetDefaultGraphicsAdapter(adapter);
}
}
emu_settings::~emu_settings()
{
return true;
}
void emu_settings::LoadSettings(const std::string& title_id)