[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49679] trunk/blender/intern/ghost/intern/ GHOST_SystemX11.cpp: patch [#32282] Fix segfault on exit in IM shutdown.

Campbell Barton ideasman42 at gmail.com
Wed Aug 8 09:31:19 CEST 2012


Revision: 49679
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49679
Author:   campbellbarton
Date:     2012-08-08 07:31:19 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
patch [#32282] Fix segfault on exit in IM shutdown.

from Bill Currie (taniwha)

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2012-08-08 01:29:20 UTC (rev 49678)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2012-08-08 07:31:19 UTC (rev 49679)
@@ -152,7 +152,9 @@
 ~GHOST_SystemX11()
 {
 #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
-	XCloseIM(m_xim);
+	if (m_xim) {
+		XCloseIM(m_xim);
+	}
 #endif
 
 	XCloseDisplay(m_display);




More information about the Bf-blender-cvs mailing list