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

compositor: Prevent an error in application code from keeping unredirect on permanently

Browse Source 
We substract one from the unredirect counter when enable_unredirect_for_screen
gets called. It is an unsigned integer so substracting one from zero (which means enable) would overflow and thus keep it peramently enabled.

This should never happen because it means there is an unmatched
enable / disable pair somewhere. So in addition to fixing it add a
warning when this case gets triggered.

https://bugzilla.gnome.org/show_bug.cgi?id=701224
This commit is contained in:
Adel Gadllah 2013-06-18 21:36:20 +02:00
parent 0c505faded
commit 2a5b068863
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compositor/compositor.c
View File

@ -1566,8 +1566,10 @@ void
meta_enable_unredirect_for_screen (MetaScreen *screen) meta_enable_unredirect_for_screen (MetaScreen *screen)
{ {
MetaCompScreen *info = meta_screen_get_compositor_data (screen); MetaCompScreen *info = meta_screen_get_compositor_data (screen);
if (info != NULL) if (info != NULL && info->disable_unredirect_count == 0)
info->disable_unredirect_count = MAX(0, info->disable_unredirect_count - 1); g_warning ("Called enable_unredirect_for_screen while unredirection is enabled.");
if (info != NULL && info->disable_unredirect_count > 0)
info->disable_unredirect_count = info->disable_unredirect_count - 1;
} }
#define FLASH_TIME_MS 50 #define FLASH_TIME_MS 50