Ensure resetting the tray works (wulkano#711)

adoxic · Sep 6, 2019 · cc3fa05 · cc3fa05
1 parent 9ff5c27
commit cc3fa05
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/main/common/aperture.js b/main/common/aperture.js
@@ -171,6 +171,7 @@ const stopRecording = async () => {
   } catch (error) {
     track('recording/stopped/error');
     dialog.showErrorBox('Recording error', error.message);
+    cleanup();
     return;
   }
 

diff --git a/main/index.js b/main/index.js
@@ -11,7 +11,7 @@ const {initializeTray} = require('./tray');
 const plugins = require('./common/plugins');
 const {initializeAnalytics} = require('./common/analytics');
 const initializeExportList = require('./export-list');
-const {openCropperWindow, isCropperOpen} = require('./cropper');
+const {openCropperWindow, isCropperOpen, closeAllCroppers} = require('./cropper');
 const {track} = require('./common/analytics');
 const {initializeGlobalAccelerators} = require('./global-accelerators');
 const {setApplicationMenu} = require('./menus');
@@ -98,6 +98,8 @@ const checkForUpdates = () => {
   checkForUpdates();
 })();
 
+app.on('before-quit', closeAllCroppers);
+
 app.on('window-all-closed', event => {
   app.dock.hide();
   event.preventDefault();

diff --git a/main/tray.js b/main/tray.js
@@ -9,6 +9,7 @@ const {track} = require('./common/analytics');
 const openFiles = require('./utils/open-files');
 
 let tray = null;
+let trayAnimation = null;
 
 const openContextMenu = () => {
   tray.popUpContextMenu(cogMenu);
@@ -32,6 +33,10 @@ const disableTray = () => {
 };
 
 const resetTray = () => {
+  if (trayAnimation) {
+    clearTimeout(trayAnimation);
+  }
+
   tray.removeAllListeners('click');
   tray.setImage(path.join(__dirname, '..', 'static', 'menubarDefaultTemplate.png'));
   tray.on('click', openCropperWindow);
@@ -48,14 +53,15 @@ const animateIcon = () => new Promise(resolve => {
   let i = 0;
 
   const next = () => {
-    setTimeout(() => {
+    trayAnimation = setTimeout(() => {
       const number = String(i++).padStart(5, '0');
       const filename = `loading_${number}Template.png`;
 
       try {
         tray.setImage(path.join(__dirname, '..', 'static', 'menubar-loading', filename));
         next();
       } catch (_) {
+        trayAnimation = null;
         resolve();
       }
     }, interval);