summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-06-17 17:24:55 +0200
committerGitHub <noreply@github.com>2019-06-17 17:24:55 +0200
commit813c0d84740b1d1c8ccece3540e945d1e821561d (patch)
tree1dc339642d1064bab253dd26a46f0fd4cd2ff237
parent1d93b4abef16d0f930ba305fd7948c9e48770a2d (diff)
parent40db7b85afa36dc7d462181fc5bd4c6bbaf7f559 (diff)
Merge pull request #29850 from akien-mga/x11-check-chdir
Linux: Check return value of chdir on cleanup
-rw-r--r--platform/x11/godot_x11.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/x11/godot_x11.cpp b/platform/x11/godot_x11.cpp
index 79407cd9dc..9baa4d6dca 100644
--- a/platform/x11/godot_x11.cpp
+++ b/platform/x11/godot_x11.cpp
@@ -55,8 +55,11 @@ int main(int argc, char *argv[]) {
os.run(); // it is actually the OS that decides how to run
Main::cleanup();
- if (ret)
- chdir(cwd);
+ if (ret) { // Previous getcwd was successful
+ if (chdir(cwd) != 0) {
+ ERR_PRINT("Couldn't return to previous working directory.");
+ }
+ }
free(cwd);
return os.get_exit_code();