mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 06:39:46 -06:00
Merge pull request #13750 from TryTwo/PR_Symbol_Loading
PPCSymbols: Restructure loading on boot and add a mutex to prevent crashes.
This commit is contained in:
@ -26,7 +26,6 @@
|
||||
#include "Common/StringUtil.h"
|
||||
|
||||
#include "Core/AchievementManager.h"
|
||||
#include "Core/Boot/Boot.h"
|
||||
#include "Core/CommonTitles.h"
|
||||
#include "Core/Config/AchievementSettings.h"
|
||||
#include "Core/Config/MainSettings.h"
|
||||
@ -1717,7 +1716,7 @@ void MenuBar::LoadSymbolMap()
|
||||
auto& ppc_symbol_db = system.GetPPCSymbolDB();
|
||||
|
||||
std::string existing_map_file, writable_map_file;
|
||||
bool map_exists = CBoot::FindMapFile(&existing_map_file, &writable_map_file);
|
||||
bool map_exists = PPCSymbolDB::FindMapFile(&existing_map_file, &writable_map_file);
|
||||
|
||||
if (!map_exists)
|
||||
{
|
||||
@ -1755,7 +1754,7 @@ void MenuBar::LoadSymbolMap()
|
||||
void MenuBar::SaveSymbolMap()
|
||||
{
|
||||
std::string existing_map_file, writable_map_file;
|
||||
CBoot::FindMapFile(&existing_map_file, &writable_map_file);
|
||||
PPCSymbolDB::FindMapFile(&existing_map_file, &writable_map_file);
|
||||
|
||||
TrySaveSymbolMap(QString::fromStdString(writable_map_file));
|
||||
}
|
||||
@ -1811,7 +1810,7 @@ void MenuBar::SaveSymbolMapAs()
|
||||
void MenuBar::SaveCode()
|
||||
{
|
||||
std::string existing_map_file, writable_map_file;
|
||||
CBoot::FindMapFile(&existing_map_file, &writable_map_file);
|
||||
PPCSymbolDB::FindMapFile(&existing_map_file, &writable_map_file);
|
||||
|
||||
const std::string path =
|
||||
writable_map_file.substr(0, writable_map_file.find_last_of('.')) + "_code.map";
|
||||
|
Reference in New Issue
Block a user