Jonttu/HeliosLauncher
1
0
Fork 1
mirror of https://github.com/dscalzi/HeliosLauncher.git synced 2024-12-21 19:22:13 -08:00
Code Issues Projects Releases Wiki Activity

Merge 5a15cc1035 into 6aaeeff9a4

Browse Source
This commit is contained in:
Ulysse Gressé-Lugué 2024-11-19 16:22:06 +01:00 committed by GitHub
commit d54b3c8dd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/js/processbuilder.js
View File

@ -8,7 +8,7 @@ const { Type } = require('helios-distribution-types')
const os = require('os')
const path = require('path')
const ConfigManager = require('./configmanager')
const ConfigManager = require('./configmanager')
const logger = LoggerUtil.getLogger('ProcessBuilder')
@ -94,6 +94,21 @@ class ProcessBuilder {
})
child.on('close', (code, signal) => {
logger.info('Exited with code', code)
if(code != 0){
setOverlayContent(
Lang.queryJS('processbuilder.exit.exitErrorHeader'),
Lang.queryJS('processbuilder.exit.message') + code,
Lang.queryJS('processbuilder.exit.copyCode')
)
setOverlayHandler(() => {
copy(Lang.queryJS('processbuilder.exit.copyCodeText') + code)
toggleOverlay(false)
})
setDismissHandler(() => {
toggleOverlay(false)
})
toggleOverlay(true, true)
}
fs.remove(tempNativePath, (err) => {
if(err){
logger.warn('Error while deleting temp dir', err)

16
app/assets/js/scripts/uicore.js
View File

@ -5,16 +5,20 @@
* modules, excluding dependencies.
*/
// Requirements
const $ = require('jquery')
const {ipcRenderer, shell, webFrame} = require('electron')
const remote = require('@electron/remote')
const isDev = require('./assets/js/isdev')
const { LoggerUtil } = require('helios-core')
const Lang = require('./assets/js/langloader')
const $ = require('jquery')
const {ipcRenderer, shell, webFrame, clipboard} = require('electron')
const remote = require('@electron/remote')
const isDev = require('./assets/js/isdev')
const { LoggerUtil } = require('helios-core')
const Lang = require('./assets/js/langloader')
const loggerUICore = LoggerUtil.getLogger('UICore')
const loggerAutoUpdater = LoggerUtil.getLogger('AutoUpdater')
function copy(value) {
clipboard.writeText(value, 'selection')
}
// Log deprecation and process warnings.
process.traceProcessWarnings = true
process.traceDeprecation = true

6
app/assets/lang/en_US.toml
View File

@ -218,6 +218,12 @@ joined = "Exploring the Realm!"
[js.overlay]
dismiss = "Dismiss"
[js.processbuilder.exit]
exitErrorHeader = "Game exited with an error code"
message = "The game exited abnormally with the exited code: "
copyCode = "Copy exit code"
copyCodeText = "Minecraft exit code "
[js.settings.fileSelectors]
executables = "Executables"
allFiles = "All Files"