diff options
| author | Michele Valente | 2018-05-17 11:34:05 +0200 |
|---|---|---|
| committer | Hein-Pieter van Braam | 2018-06-01 18:06:44 +0200 |
| commit | 9294978596d0fe05d54f7a07aa9dda17b29b3faa (patch) | |
| tree | 1c3cae045f0bcfbe1dd78a812862979b280afea0 /modules | |
| parent | 3d3e4e62af6a915a957c9818904946af75419783 (diff) | |
| download | godot-9294978596d0fe05d54f7a07aa9dda17b29b3faa.tar.gz godot-9294978596d0fe05d54f7a07aa9dda17b29b3faa.tar.zst godot-9294978596d0fe05d54f7a07aa9dda17b29b3faa.zip | |
fixes build error on Linux after its introduction in #18949
The function expects now a return value. Returning NULL seems to work in
this case.
(cherry picked from commit 6c74f3de6dbba53878d9ebe377a6c33ef2294afc)
Diffstat (limited to '')
| -rw-r--r-- | modules/mono/editor/godotsharp_builds.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp index ef54046f1..e29384aab 100644 --- a/modules/mono/editor/godotsharp_builds.cpp +++ b/modules/mono/editor/godotsharp_builds.cpp @@ -128,12 +128,12 @@ MonoString *godot_icall_BuildInstance_get_MSBuildPath() { if (build_tool == GodotSharpBuilds::XBUILD) { if (xbuild_path.empty()) { WARN_PRINT("Cannot find binary for '" PROP_NAME_XBUILD "'"); - return; + return NULL; } } else { if (msbuild_path.empty()) { WARN_PRINT("Cannot find binary for '" PROP_NAME_MSBUILD_MONO "'"); - return; + return NULL; } } |