history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-20 00:45:40 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

GameDatabase: Fix identification of misnamed-exe games

Browse Source
This commit is contained in:
Stenzek
2023-11-29 23:05:27 +10:00
parent 35799aba47
commit 4ac4388b08
5 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/duckstation-qt/settingswindow.cpp
View File

@ -26,11 +26,15 @@
#include "util/ini_settings_interface.h"
#include "common/assert.h"
#include "common/error.h"
#include "common/file_system.h"
#include "common/log.h"
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QTextEdit>
Log_SetChannel(SettingsWindow);
static QList<SettingsWindow*> s_open_game_properties_dialogs;
SettingsWindow::SettingsWindow() : QWidget()
@ -484,18 +488,35 @@ void SettingsWindow::openGamePropertiesDialog(const std::string& path, const std
}
}
std::string filename(System::GetGameSettingsPath(serial));
std::unique_ptr<INISettingsInterface> sif = std::make_unique<INISettingsInterface>(std::move(filename));
const GameDatabase::Entry* dentry = nullptr;
if (!System::IsExeFileName(path) && !System::IsPsfFileName(path))
{
// Need to resolve hash games.
Error error;
std::unique_ptr<CDImage> image = CDImage::Open(path.c_str(), false, &error);
if (image)
dentry = GameDatabase::GetEntryForDisc(image.get());
else
Log_ErrorFmt("Failed to open '{}' for game properties: {}", path, error.GetDescription());
if (!dentry)
{
// Use the serial and hope for the best...
dentry = GameDatabase::GetEntryForSerial(serial);
}
}
const std::string& real_serial = dentry ? dentry->serial : serial;
std::string ini_filename = System::GetGameSettingsPath(real_serial);
std::unique_ptr<INISettingsInterface> sif = std::make_unique<INISettingsInterface>(std::move(ini_filename));
if (FileSystem::FileExists(sif->GetFileName().c_str()))
sif->Load();
const GameDatabase::Entry* dentry = GameDatabase::GetEntryForSerial(serial);
const QString window_title(tr("%1 [%2]")
.arg(dentry ? QtUtils::StringViewToQString(dentry->title) : QStringLiteral("<UNKNOWN>"))
.arg(QtUtils::StringViewToQString(serial)));
.arg(QtUtils::StringViewToQString(real_serial)));
SettingsWindow* dialog = new SettingsWindow(path, serial, region, dentry, std::move(sif));
SettingsWindow* dialog = new SettingsWindow(path, real_serial, region, dentry, std::move(sif));
dialog->setWindowTitle(window_title);
dialog->show();
}