Skip to content

Commit 61983ee

Browse files
authored
Fixed load empty string
1 parent 2339c26 commit 61983ee

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

main.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,18 @@ ipcMain.on("resize", async (event,arg) => {
118118
event.returnValue=true;
119119
});
120120

121-
ipcMain.on("get_config", async (event,arg) => {
122-
Object.assign(defaultcfg,storage.getSync('basic'));
123-
defaultcfg=storage.getSync('basic')
124-
event.returnValue=defaultcfg;
121+
ipcMain.on("get_config", async (event, arg) => {
122+
const storedcfg = storage.getSync('basic'); // Einmalig die gespeicherte Konfiguration holen
123+
Object.assign(defaultcfg, storedcfg); // defaultcfg mit den gespeicherten Werten aktualisieren
124+
125+
for (const key in storedcfg) {
126+
// Überprüfen, ob der gespeicherte Wert kein leerer String und nicht undefined ist
127+
if (storedcfg[key] !== "" && storedcfg[key] !== undefined) {
128+
defaultcfg[key] = storedcfg[key];
129+
}
130+
}
131+
132+
event.returnValue = defaultcfg;
125133
});
126134

127135
ipcMain.on("setCAT", async (event,arg) => {

0 commit comments

Comments
 (0)