isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 09:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

backends: Fix dangling callback not being disconnected

Browse Source 
This fixes possible crashes if configuration is changed on a device that
was added and then removed.

https://bugzilla.gnome.org/show_bug.cgi?id=784881
This commit is contained in:
Carlos Garnacho 2017-07-12 12:24:16 +02:00
parent 45014a27a4
commit e52408d259
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backends/meta-input-settings.c
View File

@ -53,6 +53,7 @@ struct _DeviceMappingInfo
MetaInputSettings *input_settings; MetaInputSettings *input_settings;
ClutterInputDevice *device; ClutterInputDevice *device;
GSettings *settings; GSettings *settings;
guint changed_id;
#ifdef HAVE_LIBWACOM #ifdef HAVE_LIBWACOM
WacomDevice *wacom_device; WacomDevice *wacom_device;
#endif #endif
@ -1208,6 +1209,7 @@ device_mapping_info_free (DeviceMappingInfo *info)
if (info->wacom_device) if (info->wacom_device)
libwacom_destroy (info->wacom_device); libwacom_destroy (info->wacom_device);
#endif #endif
g_signal_handler_disconnect (info->settings, info->changed_id);
g_object_unref (info->settings); g_object_unref (info->settings);
g_slice_free (DeviceMappingInfo, info); g_slice_free (DeviceMappingInfo, info);
} }
@ -1252,8 +1254,9 @@ check_add_mappable_device (MetaInputSettings *input_settings,
} }
#endif #endif
g_signal_connect (settings, "changed", info->changed_id = g_signal_connect (settings, "changed",
G_CALLBACK (mapped_device_changed_cb), info); G_CALLBACK (mapped_device_changed_cb),
info);
g_hash_table_insert (priv->mappable_devices, device, info); g_hash_table_insert (priv->mappable_devices, device, info);