Features:

- Fixed bug white screen from update 1.7.2 to 1.7.4
drakonkat · Aug 11, 2022 · eedc5fb · eedc5fb
1 parent 6aa9af7
commit eedc5fb
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  IMAGE_VERSION: "1.7.4"
+  IMAGE_VERSION: "1.7.5"
   GIT_DEPTH: '3'
   SIMPLECOV: 'true'
   RUST_BACKTRACE: '1'

diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crawfish",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "private": false,
   "author": "drakonkat",
   "description": "Innovative torrent client",

diff --git a/public/electron.js b/public/electron.js
@@ -8,7 +8,7 @@ const {autoUpdater} = require("electron-updater")
 
 let mainWindow;
 const createWindow = () => {
-    let title = "CrawFish - 1.7.3"
+    let title = "CrawFish - 1.7.5"
     let port = 3000;
     mainWindow = new BrowserWindow({
         width: 1280,

diff --git a/routes/classes/ConfigStorage.js b/routes/classes/ConfigStorage.js
@@ -105,13 +105,22 @@ class ConfigStorage {
                     ...result.opts,
                     tracker: {...result.opts.tracker, wrtc: wrtc}
                 })
-                await this.setSpeedConf({
-                    ...result.speed,
-                    download: result.speed.download || result.opts.downloadLimit,
-                    upload: result.speed.upload || result.opts.uploadLimit,
-                    alternativeTimeStart: result.speed.alternativeTimeStart ? new Date(Date.parse(result.speed.alternativeTimeStart)) : null,
-                    alternativeTimeEnd: result.speed.alternativeTimeEnd ? new Date(Date.parse(result.speed.alternativeTimeEnd)) : null,
-                })
+                if (result.speed) {
+                    await this.setSpeedConf({
+                        ...result.speed,
+                        download: result.speed.download || result.opts.downloadLimit,
+                        upload: result.speed.upload || result.opts.uploadLimit,
+                        alternativeTimeStart: result.speed.alternativeTimeStart ? new Date(Date.parse(result.speed.alternativeTimeStart)) : null,
+                        alternativeTimeEnd: result.speed.alternativeTimeEnd ? new Date(Date.parse(result.speed.alternativeTimeEnd)) : null,
+                    })
+                } else {
+                    await this.setSpeedConf({
+                        download: result.opts.downloadLimit,
+                        upload: result.opts.uploadLimit,
+                        alternativeTimeStart: null,
+                        alternativeTimeEnd: null,
+                    })
+                }
                 // Verify old settings method
                 {
                     let torrents = JSON.parse(result[TORRENTS_KEY] || "[]");