RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 05:48:12 +00:00
Code Issues Activity Actions

DisplaySettings: Ensure wallpaper mode is always initialized

Browse source 
If loading the WindowServer config fails or we get a value other than
"simple", "center", "tile", or "scaled", DisplaySettings would crash
when changing the wallpaper image.

Fixes #4360.
This commit is contained in:
Linus Groh 2020-12-08 23:26:58 +00:00 • committed by Andreas Kling
parent 5b7fb92ede
commit bdb924522f
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Applications/DisplaySettings/DisplaySettings.cpp
View file

@ -297,13 +297,17 @@ void DisplaySettingsWidget::load_current_settings()
m_wallpaper_combo->set_selected_index(0);
}
size_t index;
/// Mode //////////////////////////////////////////////////////////////////////////////////////
auto mode = ws_config->read_entry("Background", "Mode");
if (!mode.is_empty()) {
this->m_monitor_widget->set_wallpaper_mode(mode);
auto index = m_modes.find_first_index(mode).value();
m_mode_combo->set_selected_index(index);
auto mode = ws_config->read_entry("Background", "Mode", "simple");
if (!m_modes.contains_slow(mode)) {
warnln("Invalid background mode '{}' in WindowServer config, falling back to 'simple'", mode);
mode = "simple";
}
this->m_monitor_widget->set_wallpaper_mode(mode);
index = m_modes.find_first_index(mode).value();
m_mode_combo->set_selected_index(index);
/// Resolution ////////////////////////////////////////////////////////////////////////////////
Gfx::IntSize find_size;
@ -312,7 +316,7 @@ void DisplaySettingsWidget::load_current_settings()
find_size.set_width(ws_config->read_num_entry("Screen", "Width", 1024));
find_size.set_height(ws_config->read_num_entry("Screen", "Height", 768));
size_t index = m_resolutions.find_first_index(find_size).value_or(0);
index = m_resolutions.find_first_index(find_size).value_or(0);
Gfx::IntSize m_current_resolution = m_resolutions.at(index);
m_monitor_widget->set_desktop_resolution(m_current_resolution);
m_resolution_combo->set_selected_index(index);