[gjs/ewlsh/implicit-mainloop] Revert merge changes.
- From: Evan Welsh <ewlsh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs/ewlsh/implicit-mainloop] Revert merge changes.
- Date: Thu, 1 Apr 2021 07:35:03 +0000 (UTC)
commit f73ed8007dce1dc550155f3440b4177f5815f981
Author: Evan Welsh <contact evanwelsh com>
Date: Thu Apr 1 00:34:59 2021 -0700
Revert merge changes.
gjs/context.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/gjs/context.cpp b/gjs/context.cpp
index 9890d2dc..f1e88684 100644
--- a/gjs/context.cpp
+++ b/gjs/context.cpp
@@ -1129,17 +1129,14 @@ bool GjsContextPrivate::eval(const char* script, ssize_t script_len,
}
if (exit_status_p) {
- uint8_t code;
if (retval.isInt32()) {
int code = retval.toInt32();
gjs_debug(GJS_DEBUG_CONTEXT,
"Script returned integer code %d", code);
*exit_status_p = code;
- } else if (should_exit(&code)) {
- *exit_status_p = code;
} else {
- /* Assume success if no integer was returned and should exit isn't
- * set */
+ /* Assume success if no integer was returned */
+
*exit_status_p = 0;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]