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:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-05-07 15:20:47 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-05-07 15:20:47 +0300
commit57013c0a39ac75f22eda1a76bb18881fa590b18a (patch)
tree14a0d1731279390b3002196f6f85ac46621ff0be /intern/ghost
parent5003f894e75fdc6420f5d28bf53cce7018923979 (diff)
parent592c3881bae4b063e88444d8341aa5b488b5abb5 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/ghost')
-rw-r--r--intern/ghost/intern/GHOST_DropTargetX11.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_DropTargetX11.cpp b/intern/ghost/intern/GHOST_DropTargetX11.cpp
index 0efc8a78df5..30ab843c593 100644
--- a/intern/ghost/intern/GHOST_DropTargetX11.cpp
+++ b/intern/ghost/intern/GHOST_DropTargetX11.cpp
@@ -192,7 +192,7 @@ void GHOST_DropTargetX11::UrlDecode(char *decodedOut, int bufferSize, const char
char *GHOST_DropTargetX11::FileUrlDecode(char *fileUrl)
{
- if (strncpy(fileUrl, "file://", 7) != 0) {
+ if (strncmp(fileUrl, "file://", 7) == 0) {
/* assume one character of encoded URL can be expanded to 4 chars max */
int decodedSize = 4 * strlen(fileUrl) + 1;
char *decodedPath = (char *)malloc(decodedSize);