[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] =?utf-8?q?HG=3A_xine-ui=3A_Close_X_connection_after_cl?= =?utf-8?q?osing_xine?=
From:       Petri_Hintukainen via Xine-cvslog <xine-cvslog () lists ! sourceforge ! net
Date:       2017-09-29 13:18:38
Message-ID: d56c7a679f069b4c15fa.1506690296 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Petri Hintukainen <phintuka@users.sourceforge.net>
# Date 1506690296 -10800
# Node ID d56c7a679f069b4c15fac63e3b3b1c6a71ac75ba
# Branch  default
# Parent  f8106a89f4d79eacd2d1389fb3c539d37720d56d
Close X connection after closing xine

diff --git a/src/xitk/event.c b/src/xitk/event.c
--- a/src/xitk/event.c
+++ b/src/xitk/event.c
@@ -2198,14 +2198,5 @@
 
   kbindings_save_kbinding(gui->kbindings);
   kbindings_free_kbinding(&gui->kbindings);
-
-  XLockDisplay(gui->display);
-  XUnlockDisplay(gui->display);
-  XCloseDisplay(gui->display);
-  if( gui->video_display != gui->display ) {
-    XLockDisplay(gui->video_display);
-    XUnlockDisplay(gui->video_display);
-    XCloseDisplay(gui->video_display);
-  }
 }
 
 --git a/src/xitk/main.c b/src/xitk/main.c
--- a/src/xitk/main.c
+++ b/src/xitk/main.c
@@ -2318,6 +2318,15 @@
   visual_anim_done();
   free(pplugins);
 
+  XLockDisplay(gui->display);
+  XUnlockDisplay(gui->display);
+  XCloseDisplay(gui->display);
+  if( gui->video_display != gui->display ) {
+    XLockDisplay(gui->video_display);
+    XUnlockDisplay(gui->video_display);
+    XCloseDisplay(gui->video_display);
+  }
+
   if(session_argv_num) {
     int i = 0;
     

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
[prev in list] [next in list] [prev in thread] [next in thread]