engine: Use JS_InitWithFailureDiagnostic instead of JS_Init

No difference between these two, except that JS_InitWithFailureDiagnostic
returns a descriptive message if it fails, which JS_Init ignores. So, in
the rare case that it fails, we abort while printing the descriptive
message instead of just "Could not initialize JavaScript".

1 files changed, 10 insertions, 6 deletions

diff --git a/gjs/engine.cpp b/gjs/engine.cpp
index d0f05e7d..a8e867a7 100644
--- a/gjs/engine.cpp
+++ b/gjs/engine.cpp
@@ -89,10 +89,13 @@ LPVOID    lpvReserved)
 {
   switch (fdwReason)
   {
-  case DLL_PROCESS_ATTACH:
-    gjs_dll = hinstDLL;
-    gjs_is_inited = JS_Init();
-    break;
+      case DLL_PROCESS_ATTACH: {
+          gjs_dll = hinstDLL;
+          const char* reason = JS_InitWithFailureDiagnostic();
+          if (reason)
+              g_error("Could not initialize JavaScript: %s", reason);
+          gjs_is_inited = true;
+      } break;
 
   case DLL_THREAD_DETACH:
     JS_ShutDown ();
@@ -110,8 +113,9 @@ LPVOID    lpvReserved)
 class GjsInit {
 public:
     GjsInit() {
-        if (!JS_Init())
-            g_error("Could not initialize Javascript");
+        const char* reason = JS_InitWithFailureDiagnostic();
+        if (reason)
+            g_error("Could not initialize JavaScript: %s", reason);
     }
 
     ~GjsInit() {