Merge branch 'master' into agent-web-working

1 files changed, 18 insertions, 20 deletions

diff --git a/src/client/util/request-image-size.ts b/src/client/util/request-image-size.ts
index 32ab23618..798390c7d 100644
--- a/src/client/util/request-image-size.ts
+++ b/src/client/util/request-image-size.ts
@@ -33,27 +33,25 @@ export function requestImageSize(url: string): Promise<ISizeCalculationResult> {
 
             res.on('data', chunk => {
                 buffer = Buffer.concat([buffer, chunk]);
-            });
-
-            res.on('error', reject);
-
-            res.on('end', () => {
-                try {
-                    size = imageSize(buffer);
-                    if (size) {
-                        resolve(size);
-                        req.abort();
+            })
+                .on('error', reject)
+                .on('end', () => {
+                    try {
+                        size = imageSize(buffer);
+                        if (size) {
+                            resolve(size);
+                            req.abort();
+                        }
+                    } catch (err) {
+                        /* empty */
+                        console.log('Error: ', err);
+                    }
+                    if (!size) {
+                        reject(new Error('Image has no size'));
+                        return;
                     }
-                } catch (err) {
-                    /* empty */
-                    console.log('Error: ', err);
-                }
-                if (!size) {
-                    reject(new Error('Image has no size'));
-                    return;
-                }
-                resolve(size);
-            });
+                    resolve(size);
+                });
         });
 
         req.on('error', reject);