[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60173] trunk/blender/intern/ghost/intern/ GHOST_SystemX11.cpp: Fix [#36742] Pasting image into text editor causes freeze
Bastien Montagne
montagne29 at wanadoo.fr
Mon Sep 16 20:14:04 CEST 2013
Revision: 60173
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60173
Author: mont29
Date: 2013-09-16 18:14:04 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
Fix [#36742] Pasting image into text editor causes freeze
Last fallback (XCLIB_XCOUT_FALLBACK_TEXT) was not checked, hence infinitly looping...
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 2013-09-16 16:00:19 UTC (rev 60172)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2013-09-16 18:14:04 UTC (rev 60173)
@@ -1729,11 +1729,15 @@
continue;
}
else if (context == XCLIB_XCOUT_FALLBACK_COMP) {
- /* compouned text faile, move to text. */
+ /* compouned text fail, move to text. */
context = XCLIB_XCOUT_NONE;
target = m_atom.TEXT;
continue;
}
+ else if (context == XCLIB_XCOUT_FALLBACK_TEXT) {
+ /* text fail, nothing else to try, break. */
+ context = XCLIB_XCOUT_NONE;
+ }
/* only continue if xcout() is doing something */
if (context == XCLIB_XCOUT_NONE)
More information about the Bf-blender-cvs
mailing list