[xine-devel] [PATCH] We must ensure that we destroy the top-level xine_t object after the

[Chris R. <ran...@ya...>]

# HG changeset patch
# User Chris Rankin <ran...@ya...>
# Date 1315685141 -3600
# Node ID f85022c74279ef3fd5aac1daf80a54b76e5ca4d4
# Parent  6719df8d79c4c6eb9978eb0d30e089cbd7aaacba
We must ensure that we destroy the top-level xine_t object after the
streams have been freed. This is most easily done by moving the
xine_exit() call.

diff -r 6719df8d79c4 -r f85022c74279 src/xitk/actions.c
--- a/src/xitk/actions.c	Wed Aug 17 19:18:01 2011 +0100
+++ b/src/xitk/actions.c	Sat Sep 10 21:05:41 2011 +0100
@@ -729,7 +729,7 @@
     xine_post_dispose(__xineui_global_xine_instance, gGui->visual_anim.post_output_element.post);
 
   xine_dispose(gGui->stream);
-  /* xine_dispose(gGui->visual_anim.stream); */
+  xine_dispose(gGui->visual_anim.stream);
 
   if(gGui->vo_port)
     xine_close_video_driver(__xineui_global_xine_instance, gGui->vo_port);
@@ -743,8 +743,6 @@
 
   video_window_exit();
 
-  xine_exit(__xineui_global_xine_instance); 
-
 #ifdef HAVE_LIRC
   if(__xineui_global_lirc_enable)
     lirc_stop();
diff -r 6719df8d79c4 -r f85022c74279 src/xitk/main.c
--- a/src/xitk/main.c	Wed Aug 17 19:18:01 2011 +0100
+++ b/src/xitk/main.c	Sat Sep 10 21:05:41 2011 +0100
@@ -2275,6 +2275,8 @@
   xine_event_dispose_queue(gGui->event_queue);
   xine_event_dispose_queue(gGui->visual_anim.event_queue);
 
+  xine_exit(__xineui_global_xine_instance); 
+
   visual_anim_done();
   free(pplugins);