diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-09-09 01:47:16 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-09 01:47:16 +0400 |
commit | 2d4e8ba22fc4fd304c35af629480e80d4cb8bac2 (patch) | |
tree | 251d4fe304a8bc4e8c61d8af0aa43a28e7acff11 /source | |
parent | cc0d31b921c7410d73562802725ee70100054c0e (diff) |
bugfix [#23725] bpy.context.window_manager.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 14c71e3cd95..f4c19db1277 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -617,19 +617,29 @@ static void rna_wmClipboard_get(PointerRNA *ptr, char *value) char *pbuf; pbuf= WM_clipboard_text_get(FALSE); - strcpy(value, pbuf); - - MEM_freeN(pbuf); + if(pbuf) { + strcpy(value, pbuf); + MEM_freeN(pbuf); + } + else { + value[0]= '\0'; + } } static int rna_wmClipboard_length(PointerRNA *ptr) { - char *clipboard; + char *pbuf; int length; - clipboard = WM_clipboard_text_get(FALSE); - length = (clipboard?strlen(clipboard):0); - MEM_freeN(clipboard); + pbuf = WM_clipboard_text_get(FALSE); + if(pbuf) { + length = strlen(pbuf); + MEM_freeN(pbuf); + } + else { + length= 0; + } + return length; } |