summaryrefslogtreecommitdiff
path: root/panels/display/cc-display-panel.c
diff options
context:
space:
mode:
Diffstat (limited to 'panels/display/cc-display-panel.c')
-rw-r--r--panels/display/cc-display-panel.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
index 7970e8654..65ee587c5 100644
--- a/panels/display/cc-display-panel.c
+++ b/panels/display/cc-display-panel.c
@@ -721,6 +721,12 @@ rebuild_ui (CcDisplayPanel *panel)
g_list_store_remove_all (panel->primary_display_list);
gtk_list_store_clear (panel->output_selection_list);
+ if (!panel->current_config)
+ {
+ panel->rebuilding_counter--;
+ return;
+ }
+
n_active_outputs = 0;
n_usable_outputs = 0;
outputs = cc_display_config_get_ui_sorted_monitors (panel->current_config);
@@ -962,6 +968,12 @@ update_apply_button (CcDisplayPanel *panel)
gboolean config_equal;
g_autoptr(CcDisplayConfig) applied_config = NULL;
+ if (!panel->current_config)
+ {
+ reset_titlebar (panel);
+ return;
+ }
+
applied_config = cc_display_config_manager_get_current (panel->manager);
config_equal = cc_display_config_equal (panel->current_config,