mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 11:32:04 +00:00
backends: Do NULL checks before disconnecting/connecting signals
The displayed cursor may be NULL. https://bugzilla.gnome.org/show_bug.cgi?id=754806
This commit is contained in:
parent
3067dab84c
commit
cf4b5efdd1
@ -75,12 +75,21 @@ update_displayed_cursor (MetaCursorTracker *tracker)
|
||||
if (tracker->displayed_cursor == cursor)
|
||||
return FALSE;
|
||||
|
||||
g_signal_handlers_disconnect_by_func (tracker->displayed_cursor,
|
||||
cursor_texture_updated,
|
||||
tracker);
|
||||
if (tracker->displayed_cursor)
|
||||
{
|
||||
g_signal_handlers_disconnect_by_func (tracker->displayed_cursor,
|
||||
cursor_texture_updated,
|
||||
tracker);
|
||||
}
|
||||
|
||||
g_set_object (&tracker->displayed_cursor, cursor);
|
||||
g_signal_connect (tracker->displayed_cursor, "texture-changed",
|
||||
G_CALLBACK (cursor_texture_updated), tracker);
|
||||
|
||||
if (cursor)
|
||||
{
|
||||
g_signal_connect (cursor, "texture-changed",
|
||||
G_CALLBACK (cursor_texture_updated), tracker);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user