isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-11 12:12:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: Ensure there is an unique pad OSD actor

Browse Source 
We kind of rely on the ::show-pad-osd handler to destroy the
previous actor. Just prevent the emission of multiple signals
till the actor has been destroyed.

https://bugzilla.gnome.org/show_bug.cgi?id=771067
This commit is contained in:
Carlos Garnacho 2016-10-17 18:02:50 +02:00
parent 236417be38
commit 30fa764c90
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/display.c
View File

@ -3110,13 +3110,14 @@ meta_display_request_pad_osd (MetaDisplay *display,
WacomDevice *wacom_device; WacomDevice *wacom_device;
#endif #endif
input_settings = meta_backend_get_input_settings (meta_get_backend ()); /* Avoid emitting the signal while there is an OSD being currently
* displayed, the first OSD will have to be dismissed before showing
* any other one.
*/
if (display->current_pad_osd) if (display->current_pad_osd)
{ return;
clutter_actor_destroy (display->current_pad_osd);
display->current_pad_osd = NULL; input_settings = meta_backend_get_input_settings (meta_get_backend ());
}
if (input_settings) if (input_settings)
{ {