mirror of
https://github.com/dscalzi/HeliosLauncher.git
synced 2024-12-22 19:52:14 -08:00
Merge 5a15cc1035
into eb683f89ec
This commit is contained in:
commit
ed24537edb
@ -94,6 +94,21 @@ class ProcessBuilder {
|
|||||||
})
|
})
|
||||||
child.on('close', (code, signal) => {
|
child.on('close', (code, signal) => {
|
||||||
logger.info('Exited with code', code)
|
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) => {
|
fs.remove(tempNativePath, (err) => {
|
||||||
if(err){
|
if(err){
|
||||||
logger.warn('Error while deleting temp dir', err)
|
logger.warn('Error while deleting temp dir', err)
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
*/
|
*/
|
||||||
// Requirements
|
// Requirements
|
||||||
const $ = require('jquery')
|
const $ = require('jquery')
|
||||||
const {ipcRenderer, shell, webFrame} = require('electron')
|
const {ipcRenderer, shell, webFrame, clipboard} = require('electron')
|
||||||
const remote = require('@electron/remote')
|
const remote = require('@electron/remote')
|
||||||
const isDev = require('./assets/js/isdev')
|
const isDev = require('./assets/js/isdev')
|
||||||
const { LoggerUtil } = require('helios-core')
|
const { LoggerUtil } = require('helios-core')
|
||||||
@ -15,6 +15,10 @@ const Lang = require('./assets/js/langloader')
|
|||||||
const loggerUICore = LoggerUtil.getLogger('UICore')
|
const loggerUICore = LoggerUtil.getLogger('UICore')
|
||||||
const loggerAutoUpdater = LoggerUtil.getLogger('AutoUpdater')
|
const loggerAutoUpdater = LoggerUtil.getLogger('AutoUpdater')
|
||||||
|
|
||||||
|
function copy(value) {
|
||||||
|
clipboard.writeText(value, 'selection')
|
||||||
|
}
|
||||||
|
|
||||||
// Log deprecation and process warnings.
|
// Log deprecation and process warnings.
|
||||||
process.traceProcessWarnings = true
|
process.traceProcessWarnings = true
|
||||||
process.traceDeprecation = true
|
process.traceDeprecation = true
|
||||||
|
@ -218,6 +218,12 @@ joined = "Exploring the Realm!"
|
|||||||
[js.overlay]
|
[js.overlay]
|
||||||
dismiss = "Dismiss"
|
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]
|
[js.settings.fileSelectors]
|
||||||
executables = "Executables"
|
executables = "Executables"
|
||||||
allFiles = "All Files"
|
allFiles = "All Files"
|
||||||
|
Loading…
Reference in New Issue
Block a user