mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-20 07:43:12 +09:00
Fixed windows crash on ctrl+c preventing factorio from saving
This commit is contained in:
1 parent
a76e07c07b
commit
ffa2d0b0fb
1 file changed
+13
-6
@@ -438,11 +438,6 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
|
|||||||
console.log("Clusterio | Moving instance specific mods from instance/instanceMods to instance/mods...");
|
console.log("Clusterio | Moving instance specific mods from instance/instanceMods to instance/mods...");
|
||||||
fs.copySync(path.join(instancedirectory, "instanceMods"), path.join(instancedirectory, "mods"));
|
fs.copySync(path.join(instancedirectory, "instanceMods"), path.join(instancedirectory, "mods"));
|
||||||
|
|
||||||
process.on('SIGINT', function () {
|
|
||||||
console.log("Caught interrupt signal, sending ^C");
|
|
||||||
serverprocess.kill("SIGINT");
|
|
||||||
});
|
|
||||||
|
|
||||||
// Spawn factorio server
|
// Spawn factorio server
|
||||||
//var serverprocess = child_process.exec(commandline);
|
//var serverprocess = child_process.exec(commandline);
|
||||||
fileOps.getNewestFile(instancedirectory + "/saves/", fs.readdirSync(instancedirectory + "/saves/"),function(err, latestSave) {
|
fileOps.getNewestFile(instancedirectory + "/saves/", fs.readdirSync(instancedirectory + "/saves/"),function(err, latestSave) {
|
||||||
@@ -521,11 +516,23 @@ write-data=${ path.resolve(config.instanceDirectory, instance) }\r\n
|
|||||||
});
|
});
|
||||||
client.onDidDisconnect(() => {
|
client.onDidDisconnect(() => {
|
||||||
console.log('Clusterio | RCON Disconnected!');
|
console.log('Clusterio | RCON Disconnected!');
|
||||||
process.exit(0); // exit because RCON disconnecting is undefined behaviour and we rather just wanna restart now
|
// process.exit(0); // exit because RCON disconnecting is undefined behaviour and we rather just wanna restart now
|
||||||
|
});
|
||||||
|
process.on('SIGINT', function () {
|
||||||
|
console.log("Caught interrupt signal, disconnecting RCON");
|
||||||
|
client.disconnect().then(()=>{
|
||||||
|
console.log("Rcon disconnected, Sending ^C");
|
||||||
|
// We don't actually do this, because ctrl+c in windows CMD sends it to all subprocesses as well. Doing it twice will abort factorios save.
|
||||||
|
// serverprocess.kill("SIGINT");
|
||||||
|
});
|
||||||
});
|
});
|
||||||
} else if(process.platform == "linux"){
|
} else if(process.platform == "linux"){
|
||||||
// don't open an RCON connection and just use stdio instead, does not work on windows.
|
// don't open an RCON connection and just use stdio instead, does not work on windows.
|
||||||
instanceManagement();
|
instanceManagement();
|
||||||
|
process.on('SIGINT', function () {
|
||||||
|
console.log("Caught interrupt signal, sending ^C");
|
||||||
|
serverprocess.kill("SIGINT");
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// set some globals
|
// set some globals
|
||||||
|
|||||||
Reference in new issue
Block a user