Browse Source

prevent bad exit

ca333-dev
ca333 8 years ago
parent
commit
29e3495e52
  1. 4
      gui/init.js
  2. 2
      gui/loading.js
  3. 31
      main.js

4
gui/init.js

@ -40,6 +40,6 @@ $(document).ready(function() {
sartcheck();
//setTimeout(function(){ window.close(); }, 15000);
} else {
window.close();
window.hide();
}
});
});

2
gui/loading.js

@ -130,7 +130,7 @@ function EDEX_DEXgetinfoAll() {
$('#loading_sub_status_output_text').text('Output: Connected')
}
if ( tmp_index == 10 ) {
window.close();
window.hide();
}
}).fail(function(xhr, textStatus, error) {
// handle request failures

31
main.js

@ -144,7 +144,7 @@ function createLoadingWindow() {
//loadingWindow.webContents.openDevTools()
// if window closed we kill iguana proc
loadingWindow.on('closed', function () {
loadingWindow.on('hide', function () {
// our app does not have multiwindow - so we dereference the window object instead of
// putting them into an window_arr
loadingWindow = null;
@ -280,6 +280,35 @@ app.on('window-all-closed', function () {
}*/
})
//Emitted before the application starts closing its windows.
//Calling event.preventDefault() will prevent the default behaviour, which is terminating the application.
app.on('before-quit', function (event) {
if (mainWindow === null && loadingWindow != null) { //mainWindow not intitialised and loadingWindow not dereferenced
//loading window is still open
console.log("before-quit prevented");
event.preventDefault();
}
})
//Emitted when all windows have been closed and the application will quit.
//Calling event.preventDefault() will prevent the default behaviour, which is terminating the application.
app.on('will-quit', function (event) {
if (mainWindow === null && loadingWindow != null) {
//loading window is still open
console.log("will-quit while loading window active");
event.preventDefault();
}
})
//Emitted when the application is quitting.
//Calling event.preventDefault() will prevent the default behaviour, which is terminating the application.
app.on('quit', function (event) {
if (mainWindow === null && loadingWindow != null) {
console.log("quit while loading window active");
event.preventDefault();
}
})
app.on('activate', function () {
if (mainWindow === null) {
//createWindow('open');

Loading…
Cancel
Save