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

AchievementManager: Fix crash when launching non-disc game.

This commit is contained in:
Admiral H. Curtiss 2023-04-18 11:01:11 +02:00
parent 1a2dcc53f2
commit a4e1e23c34
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/AchievementManager.cpp
View File

@ -67,11 +67,12 @@ void AchievementManager::LoadGameByFilenameAsync(const std::string& iso_path,
std::unique_ptr<DiscIO::Volume> volume; std::unique_ptr<DiscIO::Volume> volume;
}; };
rc_hash_filereader volume_reader{ rc_hash_filereader volume_reader{
.open = .open = [](const char* path_utf8) -> void* {
[](const char* path_utf8) {
auto state = std::make_unique<FilereaderState>(); auto state = std::make_unique<FilereaderState>();
state->volume = DiscIO::CreateVolume(path_utf8); state->volume = DiscIO::CreateVolume(path_utf8);
return reinterpret_cast<void*>(state.release()); if (!state->volume)
return nullptr;
return state.release();
}, },
.seek = .seek =
[](void* file_handle, int64_t offset, int origin) { [](void* file_handle, int64_t offset, int origin) {
@ -111,7 +112,8 @@ void AchievementManager::LoadGameByFilenameAsync(const std::string& iso_path,
.close = [](void* file_handle) { delete reinterpret_cast<FilereaderState*>(file_handle); }}; .close = [](void* file_handle) { delete reinterpret_cast<FilereaderState*>(file_handle); }};
rc_hash_init_custom_filereader(&volume_reader); rc_hash_init_custom_filereader(&volume_reader);
std::array<char, HASH_LENGTH> game_hash; std::array<char, HASH_LENGTH> game_hash;
rc_hash_generate_from_file(game_hash.data(), RC_CONSOLE_GAMECUBE, iso_path.c_str()); if (!rc_hash_generate_from_file(game_hash.data(), RC_CONSOLE_GAMECUBE, iso_path.c_str()))
return;
m_queue.EmplaceItem([this, callback, game_hash] { m_queue.EmplaceItem([this, callback, game_hash] {
const auto resolve_hash_response = ResolveHash(game_hash); const auto resolve_hash_response = ResolveHash(game_hash);
if (resolve_hash_response != ResponseType::SUCCESS || m_game_id == 0) if (resolve_hash_response != ResponseType::SUCCESS || m_game_id == 0)