Mirrors/lossless-cut
1
0
Fork 0
mirror of https://github.com/mifi/lossless-cut.git synced 2024-11-22 10:22:31 +01:00
Code Issues Releases Activity

try to fix #286

Browse Source
This commit is contained in:
Mikael Finstad 2020-03-31 19:59:05 +08:00
parent 8eff811409
commit 610a233f8a
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -8,8 +8,8 @@ jobs:
strategy: strategy:
matrix: matrix:
# os: [macos-latest, ubuntu-latest, windows-latest] os: [macos-latest, ubuntu-latest, windows-latest]
os: [windows-latest] # os: [windows-latest]
steps: steps:
- name: Check out Git repository - name: Check out Git repository

20
public/electron.js
View File

@ -1,6 +1,6 @@
const electron = require('electron'); // eslint-disable-line const electron = require('electron'); // eslint-disable-line
const isDev = require('electron-is-dev'); const isDev = require('electron-is-dev');
const path = require('path'); const { join } = require('path');
const menu = require('./menu'); const menu = require('./menu');
@ -16,6 +16,11 @@ app.name = 'LosslessCut';
let mainWindow; let mainWindow;
let askBeforeClose = false; let askBeforeClose = false;
let rendererReady = false;
function openFile(path) {
mainWindow.webContents.send('file-opened', [path]);
}
function createWindow() { function createWindow() {
mainWindow = new BrowserWindow({ mainWindow = new BrowserWindow({
@ -27,7 +32,7 @@ function createWindow() {
}, },
}); });
mainWindow.loadURL(isDev ? 'http://localhost:3001' : `file://${path.join(__dirname, '../build/index.html')}`); mainWindow.loadURL(isDev ? 'http://localhost:3001' : `file://${join(__dirname, '../build/index.html')}`);
if (isDev) { if (isDev) {
const { default: installExtension, REACT_DEVELOPER_TOOLS } = require('electron-devtools-installer'); // eslint-disable-line global-require,import/no-extraneous-dependencies const { default: installExtension, REACT_DEVELOPER_TOOLS } = require('electron-devtools-installer'); // eslint-disable-line global-require,import/no-extraneous-dependencies
@ -92,12 +97,21 @@ app.on('activate', () => {
} }
}); });
let openFileInitial;
electron.ipcMain.on('renderer-ready', () => { electron.ipcMain.on('renderer-ready', () => {
rendererReady = true;
if (!isDev) { if (!isDev) {
const fileToOpen = process.argv[1]; const fileToOpen = process.argv[1];
// https://github.com/electron/electron/issues/3657 // https://github.com/electron/electron/issues/3657
if (fileToOpen && !fileToOpen.startsWith('-psn_')) mainWindow.webContents.send('file-opened', [fileToOpen]); if (fileToOpen && !fileToOpen.startsWith('-psn_')) openFile(fileToOpen);
} }
if (openFileInitial) openFile(openFileInitial);
});
app.on('open-file', (event, path) => {
if (rendererReady) openFile(path);
else openFileInitial = path;
}); });
electron.ipcMain.on('setAskBeforeClose', (e, val) => { electron.ipcMain.on('setAskBeforeClose', (e, val) => {