diff --git a/src/ElectronNET.API/Runtime/Data/BuildInfo.cs b/src/ElectronNET.API/Runtime/Data/BuildInfo.cs index cb71aa08..75febe06 100644 --- a/src/ElectronNET.API/Runtime/Data/BuildInfo.cs +++ b/src/ElectronNET.API/Runtime/Data/BuildInfo.cs @@ -8,7 +8,7 @@ public class BuildInfo public string RuntimeIdentifier { get; internal set; } - public string ElectronSingleInstance { get; internal set; } + public bool ElectronSingleInstance { get; internal set; } public string Title { get; internal set; } diff --git a/src/ElectronNET.API/Runtime/StartupManager.cs b/src/ElectronNET.API/Runtime/StartupManager.cs index 125b6dee..91fed9a2 100644 --- a/src/ElectronNET.API/Runtime/StartupManager.cs +++ b/src/ElectronNET.API/Runtime/StartupManager.cs @@ -165,13 +165,9 @@ private BuildInfo GatherBuildInfo() ElectronNetRuntime.DotnetAppType = DotnetAppType.AspNetCoreApp; } - if (isSingleInstance?.Length > 0 && bool.TryParse(isSingleInstance, out var isSingleInstanceActive) && isSingleInstanceActive) + if (bool.TryParse(isSingleInstance, out var parsedBool)) { - buildInfo.ElectronSingleInstance = "yes"; - } - else - { - buildInfo.ElectronSingleInstance = "no"; + buildInfo.ElectronSingleInstance = parsedBool; } if (httpPort?.Length > 0 && int.TryParse(httpPort, out var port)) diff --git a/src/ElectronNET.Host/main.js b/src/ElectronNET.Host/main.js index 2562ca7b..9ea21ded 100644 --- a/src/ElectronNET.Host/main.js +++ b/src/ElectronNET.Host/main.js @@ -93,7 +93,7 @@ app.on('will-finish-launching', () => { const manifestJsonFile = require(manifestJsonFilePath); -if (manifestJsonFile.singleInstance === "yes") { +if (manifestJsonFile.singleInstance) { const mainInstance = app.requestSingleInstanceLock(); app.on('second-instance', (events, args = []) => { args.forEach((parameter) => { diff --git a/src/ElectronNET/build/ElectronNET.LateImport.targets b/src/ElectronNET/build/ElectronNET.LateImport.targets index 8144389e..5adc6d64 100644 --- a/src/ElectronNET/build/ElectronNET.LateImport.targets +++ b/src/ElectronNET/build/ElectronNET.LateImport.targets @@ -135,7 +135,7 @@ - + diff --git a/src/ElectronNET/build/package.template.json b/src/ElectronNET/build/package.template.json index 41837302..0f559489 100644 --- a/src/ElectronNET/build/package.template.json +++ b/src/ElectronNET/build/package.template.json @@ -23,7 +23,7 @@ }, "license": "$(License)", "executable": "$(TargetName)", - "singleInstance": "$(ElectronSingleInstance)", + "singleInstance": $(ElectronSingleInstance), "homepage": "$(ProjectUrl)", "splashscreen": { "imageFile": "$(ElectronSplashScreen)"