Skip to content

Commit 1c20897

Browse files
committed
nemo-blank-desktop-window.c: Fix potential crash when actions
are updates. Desktop windows can be destroyed when monitors power off or configurations changed. The blank desktop windows were not being disconnected from the correct action manager when disposed, causing invalid callbacks later. Fixes #3571
1 parent 95cc45e commit 1c20897

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/nemo-blank-desktop-window.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,11 +240,13 @@ nemo_blank_desktop_window_dispose (GObject *obj)
240240
g_clear_handle_id (&window->details->actions_changed_idle_id, g_source_remove);
241241

242242
if (window->details->actions_changed_id > 0) {
243-
g_signal_handler_disconnect (nemo_desktop_manager_get_action_manager (),
243+
g_signal_handler_disconnect (window->details->action_manager,
244244
window->details->actions_changed_id);
245245
window->details->actions_changed_id = 0;
246246
}
247247

248+
g_clear_object (&window->details->action_manager);
249+
248250
clear_ui (window);
249251

250252
g_signal_handlers_disconnect_by_func (nemo_menu_config_preferences, reset_popup_menu, window);

0 commit comments

Comments
 (0)