ISO: Remove resolve_path hack
- Modify Emulator::GetFakeCat to return "DG" for mounted ISO games like expected. - Undo changes to main_application resolve_path callback
This commit is contained in:
@@ -4387,7 +4387,7 @@ const std::string& Emulator::GetFakeCat() const
|
|||||||
{
|
{
|
||||||
const std::string mount_point = vfs::get("/dev_bdvd");
|
const std::string mount_point = vfs::get("/dev_bdvd");
|
||||||
|
|
||||||
if (mount_point.empty() || !IsPathInsideDir(m_path, mount_point))
|
if (mount_point.empty() || (!IsPathInsideDir(m_path, mount_point) && !m_path.starts_with(iso_device::virtual_device_name)))
|
||||||
{
|
{
|
||||||
static const std::string s_hg = "HG";
|
static const std::string s_hg = "HG";
|
||||||
return s_hg;
|
return s_hg;
|
||||||
|
|||||||
@@ -345,8 +345,7 @@ EmuCallbacks main_application::CreateCallbacks()
|
|||||||
callbacks.resolve_path = [](std::string_view sv)
|
callbacks.resolve_path = [](std::string_view sv)
|
||||||
{
|
{
|
||||||
// May result in an empty string if path does not exist
|
// May result in an empty string if path does not exist
|
||||||
std::string result = QFileInfo(QString::fromUtf8(sv.data(), static_cast<int>(sv.size()))).canonicalFilePath().toStdString();
|
return QFileInfo(QString::fromUtf8(sv.data(), static_cast<int>(sv.size()))).canonicalFilePath().toStdString();
|
||||||
return !result.empty() ? result : std::string(sv);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
callbacks.get_font_dirs = []()
|
callbacks.get_font_dirs = []()
|
||||||
|
|||||||
Reference in New Issue
Block a user