lasers
/
FreeTube
mirror of https://github.com/FreeTubeApp/FreeTube
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ensure screen saver blocker removed when window closed (#3557) 

* $ Extract method for stopping screen saver blocker

* ! Ensure screen saver blocker removed when window closed

* * Move beforeunload event listener removal to beforeDestroy
This commit is contained in:
PikachuEXE 2023-05-23 19:37:44 +08:00 committed by GitHub
parent 7084f06184
commit da6acf2599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/renderer/components/ft-video-player/ft-video-player.js
View File

@ -361,6 +361,8 @@ export default defineComponent({
navigator.mediaSession.setActionHandler('play', () => this.player.play()) navigator.mediaSession.setActionHandler('play', () => this.player.play())
navigator.mediaSession.setActionHandler('pause', () => this.player.pause()) navigator.mediaSession.setActionHandler('pause', () => this.player.pause())
} }
window.addEventListener('beforeunload', this.stopPowerSaveBlocker)
}, },
beforeDestroy: function () { beforeDestroy: function () {
document.removeEventListener('keydown', this.keyboardShortcutHandler) document.removeEventListener('keydown', this.keyboardShortcutHandler)
@ -379,10 +381,8 @@ export default defineComponent({
navigator.mediaSession.playbackState = 'none' navigator.mediaSession.playbackState = 'none'
} }
if (process.env.IS_ELECTRON && this.powerSaveBlocker !== null) { this.stopPowerSaveBlocker()
const { ipcRenderer } = require('electron') window.removeEventListener('beforeunload', this.stopPowerSaveBlocker)
ipcRenderer.send(IpcChannels.STOP_POWER_SAVE_BLOCKER, this.powerSaveBlocker)
}
}, },
methods: { methods: {
initializePlayer: async function () { initializePlayer: async function () {
@ -595,11 +595,7 @@ export default defineComponent({
navigator.mediaSession.playbackState = 'none' navigator.mediaSession.playbackState = 'none'
} }
if (process.env.IS_ELECTRON && this.powerSaveBlocker !== null) { this.stopPowerSaveBlocker()
const { ipcRenderer } = require('electron')
ipcRenderer.send(IpcChannels.STOP_POWER_SAVE_BLOCKER, this.powerSaveBlocker)
this.powerSaveBlocker = null
}
}) })
this.player.on('error', (error, message) => { this.player.on('error', (error, message) => {
@ -609,11 +605,7 @@ export default defineComponent({
navigator.mediaSession.playbackState = 'none' navigator.mediaSession.playbackState = 'none'
} }
if (process.env.IS_ELECTRON && this.powerSaveBlocker !== null) { this.stopPowerSaveBlocker()
const { ipcRenderer } = require('electron')
ipcRenderer.send(IpcChannels.STOP_POWER_SAVE_BLOCKER, this.powerSaveBlocker)
this.powerSaveBlocker = null
}
}) })
this.player.on('play', async () => { this.player.on('play', async () => {
@ -633,11 +625,7 @@ export default defineComponent({
navigator.mediaSession.playbackState = 'paused' navigator.mediaSession.playbackState = 'paused'
} }
if (process.env.IS_ELECTRON && this.powerSaveBlocker !== null) { this.stopPowerSaveBlocker()
const { ipcRenderer } = require('electron')
ipcRenderer.send(IpcChannels.STOP_POWER_SAVE_BLOCKER, this.powerSaveBlocker)
this.powerSaveBlocker = null
}
}) })
this.player.on(this.statsModalEventName, () => { this.player.on(this.statsModalEventName, () => {
@ -2116,6 +2104,14 @@ export default defineComponent({
} }
}, },
stopPowerSaveBlocker: function() {
if (process.env.IS_ELECTRON && this.powerSaveBlocker !== null) {
const { ipcRenderer } = require('electron')
ipcRenderer.send(IpcChannels.STOP_POWER_SAVE_BLOCKER, this.powerSaveBlocker)
this.powerSaveBlocker = null
}
},
...mapActions([ ...mapActions([
'updateDefaultCaptionSettings', 'updateDefaultCaptionSettings',
'parseScreenshotCustomFileName', 'parseScreenshotCustomFileName',