okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix for user presets existing preventing cider from starting

Browse source
This commit is contained in:
booploops 2022-01-28 00:33:07 -08:00
parent 1fa02ad99b
commit ef4853cfc5
3 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/i18n/en_US.jsonc
View file

@ -210,6 +210,7 @@
"settings.option.visual.windowBackgroundStyle": "Window Background Style", // Toggle "settings.option.visual.windowBackgroundStyle": "Window Background Style", // Toggle
"settings.header.visual.windowBackgroundStyle.none": "None", "settings.header.visual.windowBackgroundStyle.none": "None",
"settings.header.visual.windowBackgroundStyle.artwork": "Artwork", "settings.header.visual.windowBackgroundStyle.artwork": "Artwork",
"settings.header.visual.windowBackgroundStyle.image": "Image",
"settings.option.visual.animatedArtwork": "Animated Artwork", // Dropdown "settings.option.visual.animatedArtwork": "Animated Artwork", // Dropdown
"settings.header.visual.animatedArtwork.always": "Always", "settings.header.visual.animatedArtwork.always": "Always",
"settings.header.visual.animatedArtwork.limited": "Limited to pages and special entries", "settings.header.visual.animatedArtwork.limited": "Limited to pages and special entries",

3
src/main/base/store.ts
View file

@ -132,6 +132,9 @@ export class ConfigStore {
if (key.includes('migrations')) { if (key.includes('migrations')) {
continue; continue;
} }
if(source[key] instanceof Array) {
continue
}
if (source[key] instanceof Object) Object.assign(source[key], this.mergeStore(target[key], source[key])) if (source[key] instanceof Object) Object.assign(source[key], this.mergeStore(target[key], source[key]))
} }
// Join `target` and modified `source` // Join `target` and modified `source`

1
src/renderer/views/pages/settings.ejs
View file

@ -78,6 +78,7 @@
<select class="md-select" @change="$root.getNowPlayingArtworkBG(undefined, true)" v-model="app.cfg.visual.window_background_style"> <select class="md-select" @change="$root.getNowPlayingArtworkBG(undefined, true)" v-model="app.cfg.visual.window_background_style">
<option value="none">{{$root.getLz('settings.header.visual.windowBackgroundStyle.none')}}</option> <option value="none">{{$root.getLz('settings.header.visual.windowBackgroundStyle.none')}}</option>
<option value="artwork">{{$root.getLz('settings.header.visual.windowBackgroundStyle.artwork')}}</option> <option value="artwork">{{$root.getLz('settings.header.visual.windowBackgroundStyle.artwork')}}</option>
<option value="image">{{$root.getLz('settings.header.visual.windowBackgroundStyle.image')}}</option>
</select> </select>
</div> </div>
</div> </div>