From abb01f4ce0bc917459135f7b38532bba10d87a74 Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Sun, 4 Dec 2022 12:11:52 -0500
Subject: [PATCH] actually do what last commit was meant to do

---
 zefie_wtvp_minisrv/includes/classes/WTVShared.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/zefie_wtvp_minisrv/includes/classes/WTVShared.js b/zefie_wtvp_minisrv/includes/classes/WTVShared.js
index 034f0c05..b9d6a2c5 100644
--- a/zefie_wtvp_minisrv/includes/classes/WTVShared.js
+++ b/zefie_wtvp_minisrv/includes/classes/WTVShared.js
@@ -16,6 +16,7 @@ class WTVShared {
     parentDirectory = process.cwd()
     extend = require('util')._extend;
     debug = require('debug')('WTVShared')
+    process = require('process');
     shenanigans = null;
 
     minisrv_config = [];
@@ -446,17 +447,20 @@ class WTVShared {
             if (this.fs.lstatSync(user_config_filename)) {
                 try {
                     var minisrv_user_config = this.parseJSON(this.fs.readFileSync(user_config_filename));
-                } catch (e) {
-                    throw ("ERROR: Could not read user_config.json", e);
-                    shutdown('SIGTERM');
+                } catch (f) {
+                    console.error("ERROR: Could not read user_config.json", "\n\nReason:\n\n", f);
+                    this.process.exit(1);
                 }
             } else {
                 var minisrv_user_config = {}
             }
             return minisrv_user_config;
         } catch (e) {
-            if (minisrv_config.config.debug_flags) {
-                if (minisrv_config.config.debug_flags.debug) console.error(" * Notice: Could not find user configuration (user_config.json). Using default configuration.");
+            if (!this.fs.existsSync(user_config_filename)) {
+                console.error(" * Notice: Could not find user configuration (user_config.json). Using default configuration.");
+            } else {
+                console.error("ERROR: Could not read user_config.json", e);
+                this.process.exit(1);
             }
         }
     }
@@ -602,7 +606,7 @@ class WTVShared {
                     minisrv_config = integrateConfig(minisrv_config, minisrv_user_config)
                 } catch (e) {
                     console.error("ERROR: Could not read user_config.json", e);
-                    shutdown('SIGTERM');
+                    this.process.exit(1);
                 }
             } catch (e) {
                 if (minisrv_config.config.debug_flags) {