이슈 7866 처리

entrylabs · Nov 27, 2017 · 6022a45 · 6022a45
1 parent b021db2
commit 6022a45
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/entry_offline.js b/src/entry_offline.js
@@ -25,6 +25,7 @@ global.sharedObject = {
     roomId: '',
     mainWindowId: '',
     workingPath: '',
+    isInitEntry: false,
 }
 
 function logger(text) {
@@ -191,12 +192,13 @@ if (shouldQuit) {
         });
 
         mainWindow.on('close', function (e) {
-            if (!isForceClose) {
+            if (!isForceClose && global.sharedObject.isInitEntry) {
                 e.preventDefault();
                 cwm.closeHardwareWindow();
                 mainWindow.webContents.send('mainClose');
             }
         });
+
         mainWindow.on('closed', function () {
             mainWindow = null;
             app.quit();

diff --git a/src/renderer/src/require.js b/src/renderer/src/require.js
@@ -29,6 +29,7 @@ const sharedObject = remote.getGlobal('sharedObject');
 const mainWindowId = sharedObject.mainWindowId;
 const _mainWindow = BrowserWindow.fromId(mainWindowId);
 const archiver = require('archiver');
+sharedObject.isInitEntry = false;
 
 import parser from './bower_components/entryjs/extern/util/filbert.js';
 const filbert = parser;

diff --git a/src/renderer/src/workspace.js b/src/renderer/src/workspace.js
@@ -61,6 +61,7 @@ angular.module('workspace').controller("WorkspaceController", ['$scope', '$rootS
 
         // 기본 초기화를 수행수 동작한다.
         Entry.plugin.init(function(isPracticalCourseMode) {
+            sharedObject.isInitEntry = true;
             if (isPracticalCourseMode === true) {
                 isPracticalCourse = true;
                 addPracticalNoticePopup();                
@@ -165,11 +166,11 @@ angular.module('workspace').controller("WorkspaceController", ['$scope', '$rootS
                 })
             }
 
+
             ipcRenderer.on('mainClose', function () {
                 if(!unloadCheckFunc()) {
                     return;
                 }
-
                 window.onbeforeunload = null;
                 ipcRenderer.send('forceClose', true);
             });