@@ -14,14 +14,14 @@ import {
14
14
import fs from 'fs' ;
15
15
import path from 'path' ;
16
16
import url from 'url' ;
17
- import sanitizeFilename from 'sanitize-filename' ;
18
17
19
18
import { initialize , enable } from '@electron/remote/main' ;
20
19
import axios from 'axios' ;
21
20
import windowStateKeeper from 'electron-window-state' ;
22
21
import React from 'react' ;
23
22
// import os from 'os';
24
23
import ReactDOMServer from 'react-dom/server' ;
24
+ import sanitizeFilename from 'sanitize-filename' ;
25
25
import { ServerStyleSheet , StyleSheetManager } from 'styled-components' ;
26
26
import isURL from 'validator/es/lib/isURL' ;
27
27
@@ -32,7 +32,6 @@ import AppIcon from '../assets/img/chia64x64.png';
32
32
import About from '../components/about/About' ;
33
33
import { i18n } from '../config/locales' ;
34
34
import chiaEnvironment , { chiaInit } from '../util/chiaEnvironment' ;
35
- import downloadFile from './utils/downloadFile' ;
36
35
import loadConfig , { checkConfigFileExists } from '../util/loadConfig' ;
37
36
import manageDaemonLifetime from '../util/manageDaemonLifetime' ;
38
37
import { setUserDataDir } from '../util/userData' ;
@@ -41,6 +40,7 @@ import CacheManager from './CacheManager';
41
40
import { readAddressBook , saveAddressBook } from './addressBook' ;
42
41
import installDevTools from './installDevTools.dev' ;
43
42
import { readPrefs , savePrefs , migratePrefs } from './prefs' ;
43
+ import downloadFile from './utils/downloadFile' ;
44
44
45
45
/**
46
46
* Open the given external protocol URL in the desktop's default manner.
@@ -332,6 +332,7 @@ if (ensureSingleInstance() && ensureCorrectEnvironment()) {
332
332
333
333
for ( let i = 0 ; i < tasks . length ; i ++ ) {
334
334
const { url : downloadUrl , filename } = tasks [ i ] ;
335
+ const curMainWindow = mainWindow ;
335
336
336
337
try {
337
338
const sanitizedFilename = sanitizeFilename ( filename ) ;
@@ -345,7 +346,7 @@ if (ensureSingleInstance() && ensureCorrectEnvironment()) {
345
346
346
347
await downloadFile ( downloadUrl , filePath , {
347
348
onProgress : ( progress ) => {
348
- mainWindow ?. webContents . send ( 'multipleDownloadProgress' , {
349
+ curMainWindow ?. webContents . send ( 'multipleDownloadProgress' , {
349
350
progress,
350
351
url : downloadUrl ,
351
352
index : i ,
@@ -362,7 +363,7 @@ if (ensureSingleInstance() && ensureCorrectEnvironment()) {
362
363
if ( e . message === 'download aborted' && abortDownloadingFiles ) {
363
364
break ;
364
365
}
365
- mainWindow ?. webContents . send ( 'errorDownloadingUrl' , downloadUrl ) ;
366
+ curMainWindow ?. webContents . send ( 'errorDownloadingUrl' , downloadUrl ) ;
366
367
errorFileCount ++ ;
367
368
}
368
369
}
0 commit comments