summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorIgnacio Etcheverry <neikeq@users.noreply.github.com>2017-01-14 18:55:19 +0100
committerGitHub <noreply@github.com>2017-01-14 18:55:19 +0100
commita49e75e3741e08cca4c8f6fef41ff8088fe3c057 (patch)
tree808bfe17f74b5511af757bfdb885735e21bd9f40 /core
parentce99286362a7adbd867a2d73ec18b82aaa8f0b7d (diff)
parent54b20874b68fbf1cb84db4448ae344bd361d5826 (diff)
Merge pull request #7526 from nounoursheureux/fix-getcurrentdrive
Fix _Directory::get_current_drive error condition from breaking the build
Diffstat (limited to 'core')
-rw-r--r--core/bind/core_bind.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index d2264c6c6a..657f527a51 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -1865,7 +1865,7 @@ String _Directory::get_drive(int p_drive){
return d->get_drive(p_drive);
}
int _Directory::get_current_drive() {
- ERR_FAIL_COND_V(!d,"");
+ ERR_FAIL_COND_V(!d,0);
return d->get_current_drive();
}