Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-08-08 11:31:19 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-08 11:31:19 +0400
commit3179ee8a86fd147dbed37eefb1864326e7479cc3 (patch)
tree69ab2b347949d1b37ee831029f8ce4359d706cce /intern/ghost
parent47c7266522ac4c9e35a8aa227a6289fa7e50a7ad (diff)
patch [#32282] Fix segfault on exit in IM shutdown.
from Bill Currie (taniwha)
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/intern/GHOST_SystemX11.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index e8f172f8b1c..7ac9b0c3c24 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -152,7 +152,9 @@ GHOST_SystemX11::
~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);