ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9226 from JosJuice/bootparameters-nullptr 

Fix dereferencing nullptr BootParameters
This commit is contained in:
Jordan Woyak 2020-11-06 10:38:53 -06:00 committed by GitHub
parent 4d1c1bea34 a348efe947
commit 6a4ac74ec4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Android/jni/MainAndroid.cpp
View File

@ -513,12 +513,16 @@ static void Run(JNIEnv* env, const std::vector<std::string>& paths,
WiimoteReal::InitAdapterClass();
// No use running the loop when booting fails
s_have_wm_user_stop = false;
std::unique_ptr<BootParameters> boot = BootParameters::GenerateFromFile(paths, savestate_path);
boot->delete_savestate = delete_savestate;
if (boot)
boot->delete_savestate = delete_savestate;
WindowSystemInfo wsi(WindowSystemType::Android, nullptr, s_surf, s_surf);
wsi.render_surface_scale = GetRenderSurfaceScale(env);
// No use running the loop when booting fails
if (BootManager::BootCore(std::move(boot), wsi))
{
ButtonManager::Init(SConfig::GetInstance().GetGameID());

2
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -951,7 +951,7 @@ void MainWindow::StartGame(const std::vector<std::string>& paths,
void MainWindow::StartGame(std::unique_ptr<BootParameters>&& parameters)
{
if (std::holds_alternative<BootParameters::Disc>(parameters->parameters))
if (parameters && std::holds_alternative<BootParameters::Disc>(parameters->parameters))
{
if (std::get<BootParameters::Disc>(parameters->parameters).volume->IsNKit())
{