EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-2829 mac: Ignore the single instance lock in Mac

main
Dani Palou 2019-01-17 09:58:27 +01:00
parent 6e70b4d5b6
commit 7a79d56843
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/electron.js
View File

@ -71,9 +71,11 @@ function createWindow() {
} }
// Make sure that only a single instance of the app is running. // Make sure that only a single instance of the app is running.
// For some reason, gotTheLock is always false in signed Mac apps so we should ingore it.
// See https://github.com/electron/electron/issues/15958
var gotTheLock = app.requestSingleInstanceLock(); var gotTheLock = app.requestSingleInstanceLock();
if (!gotTheLock) { if (!gotTheLock && os.platform().indexOf('darwin') == -1) {
// It's not the main instance of the app, kill it. // It's not the main instance of the app, kill it.
app.exit(); app.exit();
return; return;

1
src/assets/lang/en.json
View File

@ -1246,6 +1246,7 @@
"core.courses.enrolme": "Enrol me", "core.courses.enrolme": "Enrol me",
"core.courses.errorloadcategories": "An error occurred while loading categories.", "core.courses.errorloadcategories": "An error occurred while loading categories.",
"core.courses.errorloadcourses": "An error occurred while loading courses.", "core.courses.errorloadcourses": "An error occurred while loading courses.",
"core.courses.errorloadplugins": "The plugins required by this course could not be loaded correctly. Please restart the app to try again.",
"core.courses.errorsearching": "An error occurred while searching.", "core.courses.errorsearching": "An error occurred while searching.",
"core.courses.errorselfenrol": "An error occurred while self enrolling.", "core.courses.errorselfenrol": "An error occurred while self enrolling.",
"core.courses.filtermycourses": "Filter my courses", "core.courses.filtermycourses": "Filter my courses",