diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-09-16 22:14:04 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-09-16 22:14:04 +0400 |
| commit | 8b093329ff96afbabe9086946bfe34ac5545d6c0 (patch) | |
| tree | db982cfdb33959b203c7ef7b9833b5816df21b86 /intern | |
| parent | 31b84c9c28f545b4d8980b638cca3246ab89274c (diff) | |
Fix [#36742] Pasting image into text editor causes freeze
Last fallback (XCLIB_XCOUT_FALLBACK_TEXT) was not checked, hence infinitly looping...
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 2e39ee812ca..0746dd8f14a 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1729,11 +1729,15 @@ GHOST_TUns8 *GHOST_SystemX11::getClipboard(bool selection) const 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) |