waylandsink : change wl_display_disconnect() position. 37/87537/1 accepted/tizen/common/20160921.162205 accepted/tizen/ivi/20160922.042620 accepted/tizen/mobile/20160922.042331 accepted/tizen/tv/20160922.042455 accepted/tizen/wearable/20160922.042541 submit/tizen/20160921.041639
authorHyunil <hyunil46.park@samsung.com>
Thu, 8 Sep 2016 11:46:54 +0000 (20:46 +0900)
committerHyunil <hyunil46.park@samsung.com>
Thu, 8 Sep 2016 11:46:54 +0000 (20:46 +0900)
Change-Id: I99f8bb10197d50c7fe5e2a3c1f8166af24fc64cd
Signed-off-by: Hyunil <hyunil46.park@samsung.com>
ext/wayland/wldisplay.c

index e4a7b6b..2b58ef8 100644 (file)
@@ -132,9 +132,21 @@ gst_wl_display_finalize (GObject * gobject)
 #endif
   if (self->shm)
     wl_shm_destroy (self->shm);
+
   if (self->shell)
     wl_shell_destroy (self->shell);
 
+  if (self->scaler)
+    wl_scaler_destroy (self->scaler);
+
+#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
+  if (self->tizen_policy)
+    tizen_policy_destroy (self->tizen_policy);
+
+  if (self->tizen_video)
+    tizen_video_destroy (self->tizen_video);
+#endif
+
   if (self->compositor)
     wl_compositor_destroy (self->compositor);
 
@@ -151,14 +163,6 @@ gst_wl_display_finalize (GObject * gobject)
     wl_display_flush (self->display);
     wl_display_disconnect (self->display);
   }
-#ifdef TIZEN_FEATURE_WLSINK_ENHANCEMENT
-  if (self->scaler)
-    wl_scaler_destroy (self->scaler);
-  if (self->tizen_policy)
-    tizen_policy_destroy (self->tizen_policy);
-  if (self->tizen_video)
-    tizen_video_destroy (self->tizen_video);
-#endif
 
   G_OBJECT_CLASS (gst_wl_display_parent_class)->finalize (gobject);
 }