[gtk+] gdkwindow-wayland: Erm, put the DESTROYED check in the right spot...



commit c08b315c3263d609d4c923b81113af02129637a0
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Fri Jan 31 16:39:33 2014 -0500

    gdkwindow-wayland: Erm, put the DESTROYED check in the right spot...

 gdk/wayland/gdkwindow-wayland.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index ec51f59..025b03b 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -315,6 +315,10 @@ frame_callback (void               *data,
   GdkFrameTimings *timings;
 
   wl_callback_destroy (callback);
+
+  if (GDK_WINDOW_DESTROYED (window))
+    return;
+
   _gdk_frame_clock_thaw (clock);
 
   timings = gdk_frame_clock_get_timings (clock, impl->pending_frame_counter);
@@ -403,10 +407,6 @@ on_frame_clock_after_paint (GdkFrameClock *clock,
     return;
 
   impl->pending_commit = FALSE;
-
-  if (GDK_WINDOW_DESTROYED (window))
-    return;
-
   impl->pending_frame_counter = gdk_frame_clock_get_frame_counter (clock);
 
   callback = wl_surface_frame (impl->surface);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]