piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash when launching gamecube games with MIOS (from the Wii menu)

Browse Source
This commit is contained in:
Pokechu22 2020-01-13 19:48:19 -08:00
parent 9596fe75f1
commit d67c4f34d1
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Core/IOS/DI/DI.cpp
View File

@ -526,6 +526,16 @@ std::optional<DI::DIResult> DI::StartImmediateTransfer(const IOCtlRequest& reque
return {}; return {};
} }
static std::shared_ptr<DI> GetDevice()
{
auto ios = IOS::HLE::GetIOS();
if (!ios)
return nullptr;
auto di = ios->GetDeviceByName("/dev/di");
// di may be empty, but static_pointer_cast returns empty in that case
return std::static_pointer_cast<DI>(di);
}
void DI::InterruptFromDVDInterface(DVDInterface::DIInterruptType interrupt_type) void DI::InterruptFromDVDInterface(DVDInterface::DIInterruptType interrupt_type)
{ {
DIResult result; DIResult result;
@ -544,10 +554,10 @@ void DI::InterruptFromDVDInterface(DVDInterface::DIInterruptType interrupt_type)
break; break;
} }
auto di = IOS::HLE::GetIOS()->GetDeviceByName("/dev/di"); auto di = GetDevice();
if (di) if (di)
{ {
std::static_pointer_cast<DI>(di)->FinishDICommand(result); di->FinishDICommand(result);
} }
else else
{ {
@ -560,9 +570,9 @@ void DI::FinishDICommandCallback(u64 userdata, s64 ticksbehind)
{ {
const DIResult result = static_cast<DIResult>(userdata); const DIResult result = static_cast<DIResult>(userdata);
auto di = IOS::HLE::GetIOS()->GetDeviceByName("/dev/di"); auto di = GetDevice();
if (di) if (di)
std::static_pointer_cast<DI>(di)->FinishDICommand(result); di->FinishDICommand(result);
else else
PanicAlert("IOS::HLE::Device::DI: Received interrupt from DI when device wasn't registered!"); PanicAlert("IOS::HLE::Device::DI: Received interrupt from DI when device wasn't registered!");
} }
@ -691,12 +701,12 @@ void DI::ChangePartition(const DiscIO::Partition partition)
DiscIO::Partition DI::GetCurrentPartition() DiscIO::Partition DI::GetCurrentPartition()
{ {
auto di = IOS::HLE::GetIOS()->GetDeviceByName("/dev/di"); auto di = GetDevice();
// Note that this function is called in Gamecube mode for UpdateRunningGameMetadata, // Note that this function is called in Gamecube mode for UpdateRunningGameMetadata,
// so both cases are hit in normal circumstances. // so both cases are hit in normal circumstances.
if (!di) if (!di)
return DiscIO::PARTITION_NONE; return DiscIO::PARTITION_NONE;
return std::static_pointer_cast<DI>(di)->m_current_partition; return di->m_current_partition;
} }
void DI::InitializeIfFirstTime() void DI::InitializeIfFirstTime()