diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-13 00:28:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-13 00:28:07 +0300 |
commit | 433eeee41f0c33a8a96a01e8f4d871af7663f144 (patch) | |
tree | 0f66cb8c16621bf2f018d4bb415e9e32115e265c /source/blender/windowmanager | |
parent | 450a09de2e1bd4405d4124aae9e6fbec6def6c4b (diff) |
clipboard setting background check correction.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index a4fa646c043..c962ee8c118 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -1030,36 +1030,35 @@ char *WM_clipboard_text_get(int selection) void WM_clipboard_text_set(char *buf, int selection) { + if(!G.background) { #ifdef _WIN32 - /* do conversion from \n to \r\n on Windows */ - char *p, *p2, *newbuf; - int newlen= 0; - - for(p= buf; *p; p++) { - if(*p == '\n') - newlen += 2; - else - newlen++; - } + /* do conversion from \n to \r\n on Windows */ + char *p, *p2, *newbuf; + int newlen= 0; + + for(p= buf; *p; p++) { + if(*p == '\n') + newlen += 2; + else + newlen++; + } + + newbuf= MEM_callocN(newlen+1, "WM_clipboard_text_set"); - newbuf= MEM_callocN(newlen+1, "WM_clipboard_text_set"); - - for(p= buf, p2= newbuf; *p; p++, p2++) { - if(*p == '\n') { - *(p2++)= '\r'; *p2= '\n'; + for(p= buf, p2= newbuf; *p; p++, p2++) { + if(*p == '\n') { + *(p2++)= '\r'; *p2= '\n'; + } + else *p2= *p; } - else *p2= *p; - } - *p2= '\0'; - - GHOST_putClipboard((GHOST_TInt8*)newbuf, selection); - MEM_freeN(newbuf); + *p2= '\0'; + + GHOST_putClipboard((GHOST_TInt8*)newbuf, selection); + MEM_freeN(newbuf); #else - GHOST_putClipboard((GHOST_TInt8*)buf, selection); + GHOST_putClipboard((GHOST_TInt8*)buf, selection); #endif - - if(G.background) - return; + } } /* ******************* progress bar **************** */ |