brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

display: Tweak code to work around a compiler warning

Browse Source 
The compiler is not quite smart enough to figure out that the condition
for setting the "compositor" variable matches a later condition for
accessing it, so express this in a way the compiler will understand.
This commit is contained in:
Florian Müllner 2013-11-19 19:44:30 +01:00
parent 333661a9d8
commit 17f48baf3a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/display.c
View File

@ -2042,7 +2042,7 @@ meta_display_handle_event (MetaDisplay *display,
/* XXX -- we need to fill this in properly at some point... */ /* XXX -- we need to fill this in properly at some point... */
gboolean frame_was_receiver = FALSE; gboolean frame_was_receiver = FALSE;
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
MetaWaylandCompositor *compositor; MetaWaylandCompositor *compositor = NULL;
if (meta_is_wayland_compositor ()) if (meta_is_wayland_compositor ())
{ {
@ -2293,7 +2293,7 @@ meta_display_handle_event (MetaDisplay *display,
} }
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
if (meta_is_wayland_compositor () && (display->grab_op == META_GRAB_OP_NONE)) if (compositor && (display->grab_op == META_GRAB_OP_NONE))
{ {
if (meta_wayland_compositor_handle_event (compositor, event)) if (meta_wayland_compositor_handle_event (compositor, event))
return TRUE; return TRUE;