diff --git a/CHANGELOG.md b/CHANGELOG.md index 557a094..74fb2d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.0.16] +* Fixed bug where cancelling a restart prevents from further restart attempts + ## [2.0.15] * Hack together zone log streaming support again (Relies on server configured for Websockets) diff --git a/app/core/server-process-manager.js b/app/core/server-process-manager.js index 6f2bf91..c9b611d 100644 --- a/app/core/server-process-manager.js +++ b/app/core/server-process-manager.js @@ -392,9 +392,10 @@ module.exports = { restartServer: async function (options = []) { this.init(options, true); - /** - * Delayed restart - */ + // reset timed restart if triggered restart again + this.cancelTimedRestart = false; + + // delayed restart if (options.timer && options.timer > 0) { const startTime = Math.floor(new Date() / 1000); diff --git a/package.json b/package.json index ef66168..9b91c7c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eqemu-admin", - "version": "2.0.15", + "version": "2.0.16", "private": true, "bin": "./app/bin/admin", "scripts": {