prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Open current per game config when game is running

Browse Source 
Instead of opening global config. Also prevents strange glitches from switching current game config mid-game.
This commit is contained in:
Zach Hilman
2018-10-19 18:07:57 -04:00
parent 6c728b4819
commit 573b88ab27
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/loader/loader.h
View File

@@ -252,6 +252,10 @@ public:
return ResultStatus::ErrorNotImplemented;
}
FileSys::VirtualFile GetFile() {
return file;
}
protected:
FileSys::VirtualFile file;
bool is_loaded = false;

2
src/yuzu/configuration/config.cpp
View File

@@ -512,7 +512,7 @@ void Config::SaveValues() {
if (update_values.find(read_title_id) == update_values.end()) {
ReadPerGameSettings(values);
PerGameValuesChange change;
PerGameValuesChange change{};
ReadPerGameSettingsDelta(change);
update_values.emplace(read_title_id, values);

29
src/yuzu/main.cpp
View File

@@ -966,7 +966,6 @@ void GMainWindow::OnGameListNavigateToGamedbEntry(u64 program_id,
}
void GMainWindow::OnGameListOpenProperties(FileSys::VirtualFile file) {
u64 title_id{};
if (Loader::GetLoader(file)->ReadProgramId(title_id) != Loader::ResultStatus::Success) {
QMessageBox::information(
@@ -1346,13 +1345,30 @@ void GMainWindow::ToggleWindowMode() {
}
void GMainWindow::OnConfigure() {
Settings::values.SetCurrentTitleID(Settings::DEFAULT_PER_GAME);
ConfigureDialog configureDialog(this, hotkey_registry);
const auto old_title_id = Settings::values.CurrentTitleID();
auto old_theme = UISettings::values.theme;
const bool old_discord_presence = UISettings::values.enable_discord_presence;
auto result = configureDialog.exec();
int result = QDialog::Rejected;
if (emu_thread == nullptr) {
Settings::values.SetCurrentTitleID(Settings::DEFAULT_PER_GAME);
ConfigureDialog configureDialog(this, hotkey_registry);
result = configureDialog.exec();
if (result == QDialog::Accepted)
configureDialog.applyConfiguration();
} else {
ConfigurePerGameDialog configureDialog(this,
Core::System::GetInstance().GetAppLoader().GetFile(),
config->GetPerGameSettingsDelta(old_title_id));
result = configureDialog.exec();
if (result == QDialog::Accepted)
config->SetPerGameSettingsDelta(old_title_id, configureDialog.applyConfiguration());
}
if (result == QDialog::Accepted) {
configureDialog.applyConfiguration();
if (UISettings::values.theme != old_theme)
UpdateUITheme();
if (UISettings::values.enable_discord_presence != old_discord_presence)
@@ -1364,6 +1380,9 @@ void GMainWindow::OnConfigure() {
}
config->Save();
}
if (emu_thread == nullptr)
Settings::values.SetCurrentTitleID(old_title_id);
}
void GMainWindow::OnLoadAmiibo() {