Merge pull request #81 from 577fkj/main

Fix #77
T-REX-XP · Feb 7, 2025 · 08a9588 · 08a9588
2 parents a4c1b19 + 7a98a39
commit 08a9588
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/src/tabs/main.js b/src/src/tabs/main.js
@@ -132,13 +132,16 @@ export default
                 },
             };
             return Ext.apply(t, e), t;
-        }, _getRrConfig: function () {
+        }, _getRrConfig: async function () {
             const rrConfigJson = localStorage.getItem('rrConfig');
-            return JSON.parse(rrConfigJson);
+            if (rrConfigJson) {
+                return JSON.parse(rrConfigJson);
+            }
+            return await self.getConf();
         },
-        __checkDownloadFolder: function (callback) {
+        __checkDownloadFolder: async function (callback) {
             var self = this;
-            const rrConfig = this._getRrConfig();
+            const rrConfig = await this._getRrConfig();
             const config = rrConfig.rr_manager_config;
             self.apiProvider.getSharesList().then(x => {
                 var shareName = `/${config['SHARE_NAME']}`;
@@ -285,7 +288,7 @@ export default
                     var isModernDSM = systemInfo.version_string.includes("7.2.2");
                     self.apiProvider.setIsModernDSM(isModernDSM);
 
-                    self.__checkDownloadFolder(self.__checkRequiredTasks.bind(self));
+                    await self.__checkDownloadFolder(self.__checkRequiredTasks.bind(self));
                     if (systemInfo && packages) {
                         self.rrCheckVersion = rrCheckVersion;
                         //TODO: implement localization

diff --git a/src/src/tabs/setting.js b/src/src/tabs/setting.js
@@ -132,7 +132,7 @@ export default
             var rrConfigJson = localStorage.getItem("rrConfig");
             var rrConfigOrig = JSON.parse(rrConfigJson);
             var rrManagerConfigJson = localStorage.getItem("rrConfig");
-            var rrManagerConfigOrig = JSON.parse(rrManagerConfigJson);\
+            var rrManagerConfigOrig = JSON.parse(rrManagerConfigJson);
             rrConfigOrig.user_config = user_config;
             localStorage.setItem("rrConfig", JSON.stringify(rrConfigOrig));