style: adjust clang-format rules (#2186)
Co-authored-by: Vithorio Polten <reach@vithor.io>
This commit is contained in:
@@ -39,8 +39,7 @@ namespace nvprefs {
|
||||
unload();
|
||||
}
|
||||
|
||||
bool
|
||||
nvprefs_interface::load() {
|
||||
bool nvprefs_interface::load() {
|
||||
if (!pimpl->loaded) {
|
||||
// Check %ProgramData% variable, need it for storing undo file
|
||||
wchar_t program_data_env[MAX_PATH];
|
||||
@@ -61,8 +60,7 @@ namespace nvprefs {
|
||||
return pimpl->loaded;
|
||||
}
|
||||
|
||||
void
|
||||
nvprefs_interface::unload() {
|
||||
void nvprefs_interface::unload() {
|
||||
if (pimpl->loaded) {
|
||||
// Unload dynamically loaded nvapi library
|
||||
pimpl->driver_settings.destroy();
|
||||
@@ -70,9 +68,10 @@ namespace nvprefs {
|
||||
}
|
||||
}
|
||||
|
||||
bool
|
||||
nvprefs_interface::restore_from_and_delete_undo_file_if_exists() {
|
||||
if (!pimpl->loaded) return false;
|
||||
bool nvprefs_interface::restore_from_and_delete_undo_file_if_exists() {
|
||||
if (!pimpl->loaded) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Check for undo file from previous improper termination
|
||||
bool access_denied = false;
|
||||
@@ -82,12 +81,10 @@ namespace nvprefs {
|
||||
if (auto undo_data = undo_file->read_undo_data()) {
|
||||
if (pimpl->driver_settings.restore_global_profile_to_undo(*undo_data) && pimpl->driver_settings.save_settings()) {
|
||||
info_message("Restored global profile settings from undo file - deleting the file");
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
error_message("Failed to restore global profile settings from undo file, deleting the file anyway");
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
error_message("Coulnd't read undo file, deleting the file anyway");
|
||||
}
|
||||
|
||||
@@ -95,8 +92,7 @@ namespace nvprefs {
|
||||
error_message("Couldn't delete undo file");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (access_denied) {
|
||||
} else if (access_denied) {
|
||||
error_message("Couldn't open undo file from previous improper termination, or confirm that there's no such file");
|
||||
return false;
|
||||
}
|
||||
@@ -104,43 +100,41 @@ namespace nvprefs {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
nvprefs_interface::modify_application_profile() {
|
||||
if (!pimpl->loaded) return false;
|
||||
bool nvprefs_interface::modify_application_profile() {
|
||||
if (!pimpl->loaded) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Modify and save sunshine.exe application profile settings, if needed
|
||||
bool modified = false;
|
||||
if (!pimpl->driver_settings.check_and_modify_application_profile(modified)) {
|
||||
error_message("Failed to modify application profile settings");
|
||||
return false;
|
||||
}
|
||||
else if (modified) {
|
||||
} else if (modified) {
|
||||
if (pimpl->driver_settings.save_settings()) {
|
||||
info_message("Modified application profile settings");
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
error_message("Couldn't save application profile settings");
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
info_message("No need to modify application profile settings");
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
nvprefs_interface::modify_global_profile() {
|
||||
if (!pimpl->loaded) return false;
|
||||
bool nvprefs_interface::modify_global_profile() {
|
||||
if (!pimpl->loaded) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Modify but not save global profile settings, if needed
|
||||
std::optional<undo_data_t> undo_data;
|
||||
if (!pimpl->driver_settings.check_and_modify_global_profile(undo_data)) {
|
||||
error_message("Couldn't modify global profile settings");
|
||||
return false;
|
||||
}
|
||||
else if (!undo_data) {
|
||||
} else if (!undo_data) {
|
||||
info_message("No need to modify global profile settings");
|
||||
return true;
|
||||
}
|
||||
@@ -166,8 +160,7 @@ namespace nvprefs {
|
||||
if (pimpl->undo_data) {
|
||||
// Merge undo data if settings has been modified externally since our last modification
|
||||
pimpl->undo_data->merge(*undo_data);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
pimpl->undo_data = undo_data;
|
||||
}
|
||||
|
||||
@@ -198,14 +191,14 @@ namespace nvprefs {
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
nvprefs_interface::owning_undo_file() {
|
||||
bool nvprefs_interface::owning_undo_file() {
|
||||
return pimpl->undo_file.has_value();
|
||||
}
|
||||
|
||||
bool
|
||||
nvprefs_interface::restore_global_profile() {
|
||||
if (!pimpl->loaded || !pimpl->undo_data || !pimpl->undo_file) return false;
|
||||
bool nvprefs_interface::restore_global_profile() {
|
||||
if (!pimpl->loaded || !pimpl->undo_data || !pimpl->undo_file) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Restore global profile settings with undo data
|
||||
if (pimpl->driver_settings.restore_global_profile_to_undo(*pimpl->undo_data) &&
|
||||
@@ -217,8 +210,7 @@ namespace nvprefs {
|
||||
}
|
||||
pimpl->undo_data = std::nullopt;
|
||||
pimpl->undo_file = std::nullopt;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
error_message("Couldn't restore global profile settings");
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user