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

Merge branch 'main' of https://github.com/ciderapp/Cider

Browse source
This commit is contained in:
yazninja 2022-05-25 21:51:36 +08:00
commit 93bf5652d2
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/main/vueapp.js
View file

@ -972,7 +972,9 @@ const app = new Vue({
this.appRoute(window.location.hash) this.appRoute(window.location.hash)
} }
if(this.page != "home") {
this.resumeTabs() this.resumeTabs()
}
this.mediaKeyFixes() this.mediaKeyFixes()
setTimeout(() => { setTimeout(() => {

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

@ -1301,7 +1301,7 @@
}, watch: { }, watch: {
tabIndex: function (val) { tabIndex: function (val) {
if (this.canChangeHash) { if (this.canChangeHash) {
window.location.hash = `#settings/${val}` // window.location.hash = `#settings/${val}`
} }
} }
}, },