Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/windows/settings_manager_apply.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ namespace display_device {
const auto original_primary_device { cached_primary_device.empty() ? current_primary_device : cached_primary_device };
const auto &new_primary_device { device_to_configure };

if (!try_change(new_primary_device, "Changing primary display to: ", "Failed to apply new configuration, because a new primary device could not be set!")) {
if (!try_change(new_primary_device, "Changing primary display to:\n", "Failed to apply new configuration, because a new primary device could not be set!")) {
// Error already logged
return false;
}
Expand All @@ -255,7 +255,7 @@ namespace display_device {
}

if (might_need_to_restore) {
if (!try_change(cached_primary_device, "Changing primary display back to: ", "Failed to restore original primary device!")) {
if (!try_change(cached_primary_device, "Changing primary display back to:\n", "Failed to restore original primary device!")) {
// Error already logged
return false;
}
Expand Down Expand Up @@ -307,7 +307,7 @@ namespace display_device {
const auto new_display_modes { win_utils::computeNewDisplayModes(config.m_resolution,
config.m_refresh_rate, configuring_primary_devices, device_to_configure, additional_devices_to_configure, original_display_modes) };

if (!try_change(new_display_modes, "Changing display modes to: ", "Failed to apply new configuration, because new display modes could not be set!")) {
if (!try_change(new_display_modes, "Changing display modes to:\n", "Failed to apply new configuration, because new display modes could not be set!")) {
// Error already logged
return false;
}
Expand All @@ -318,7 +318,7 @@ namespace display_device {
}

if (might_need_to_restore) {
if (!try_change(cached_display_modes, "Changing display modes back to: ", "Failed to restore original display modes!")) {
if (!try_change(cached_display_modes, "Changing display modes back to:\n", "Failed to restore original display modes!")) {
// Error already logged
return false;
}
Expand Down Expand Up @@ -364,7 +364,7 @@ namespace display_device {
const auto original_hdr_states { cached_hdr_states.empty() ? current_hdr_states : cached_hdr_states };
const auto new_hdr_states { win_utils::computeNewHdrStates(config.m_hdr_state, configuring_primary_devices, device_to_configure, additional_devices_to_configure, original_hdr_states) };

if (!try_change(new_hdr_states, "Changing HDR states to: ", "Failed to apply new configuration, because new HDR states could not be set!")) {
if (!try_change(new_hdr_states, "Changing HDR states to:\n", "Failed to apply new configuration, because new HDR states could not be set!")) {
// Error already logged
return false;
}
Expand All @@ -375,7 +375,7 @@ namespace display_device {
}

if (might_need_to_restore) {
if (!try_change(cached_hdr_states, "Changing HDR states back to: ", "Failed to restore original HDR states!")) {
if (!try_change(cached_hdr_states, "Changing HDR states back to:\n", "Failed to restore original HDR states!")) {
// Error already logged
return false;
}
Expand Down