Skip to content
This repository has been archived by the owner on Oct 22, 2021. It is now read-only.

Commit

Permalink
🚸 Better override behavior with --nointro flag
Browse files Browse the repository at this point in the history
  • Loading branch information
GitSquared committed Feb 22, 2019
1 parent 10ab5c4 commit e973df8
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/_renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ const settingsFile = path.join(settingsDir, "settings.json");
window.settings = require(settingsFile);

// Load CLI parameters
if (electron.remote.process.argv.includes("--nointro") || window.settings.nointro) {
window.settings.nointro = true;
if (electron.remote.process.argv.includes("--nointro")) {
window.settings.nointroOverride = true;
} else {
window.settings.nointro = false;
window.settings.nointroOverride = false;
}

// Retrieve theme override (hotswitch)
ipc.once("getThemeOverride", (e, theme) => {
if (theme !== null) {
window.settings.theme = theme;
window.settings.nointro = true;
window.settings.nointroOverride = true;
_loadTheme(require(path.join(themesDir, window.settings.theme+".json")));
} else {
_loadTheme(require(path.join(themesDir, window.settings.theme+".json")));
Expand All @@ -63,7 +63,7 @@ ipc.send("getThemeOverride");
ipc.once("getKbOverride", (e, layout) => {
if (layout !== null) {
window.settings.keyboard = layout;
window.settings.nointro = true;
window.settings.nointroOverride = true;
}
});
ipc.send("getKbOverride");
Expand Down Expand Up @@ -180,7 +180,7 @@ window.audioManager = new AudioManager();
electron.remote.app.focus();

let i = 0;
if (!window.settings.nointro) {
if (!window.settings.nointro || window.settings.nointroOverride) {
displayLine();
} else {
initGraphicalErrorHandling();
Expand Down Expand Up @@ -641,7 +641,7 @@ window.openSettings = async () => {
</tr>
<tr>
<td>nointro</td>
<td>Skip the intro boot log and logo</td>
<td>Skip the intro boot log and logo${(window.settings.nointroOverride) ? " (Currently overridden by CLI flag)" : ""}</td>
<td><select id="settingsEditor-nointro">
<option>${window.settings.nointro}</option>
<option>${!window.settings.nointro}</option>
Expand Down

0 comments on commit e973df8

Please sign in to comment.