Use forward slashes for Windows paths in Preferences.ini

edward-ly · Apr 3, 2021 · 52e3b4d · 52e3b4d
1 parent ca2a707
commit 52e3b4d
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src-electron/electron-main.js b/src-electron/electron-main.js
@@ -342,8 +342,11 @@ ipcMain.on('add-paths-preferences-ini', (event, iniFiles, paths) => {
       if (err) return
 
       const newData = data.replace(/(?<=AdditionalSongFolders=).*/, (match) => {
-        const iniPaths = match.length ? match.split(',') : []
-        return _.union(iniPaths, paths).join(',')
+        const iniPaths = match.length
+          ? match.replace(/\\/g, '/').split(',')
+          : []
+        const newPaths = paths.map((path) => path.replace(/\\/g, '/'))
+        return _.union(iniPaths, newPaths).join(',')
       })
 
       fs.writeFile(file, newData, () => {})
@@ -357,8 +360,11 @@ ipcMain.on('delete-paths-preferences-ini', (event, iniFiles, paths) => {
       if (err) return
 
       const newData = data.replace(/(?<=AdditionalSongFolders=).*/, (match) => {
-        const iniPaths = match.length ? match.split(',') : []
-        return _.difference(iniPaths, paths).join(',')
+        const iniPaths = match.length
+          ? match.replace(/\\/g, '/').split(',')
+          : []
+        const newPaths = paths.map((path) => path.replace(/\\/g, '/'))
+        return _.difference(iniPaths, newPaths).join(',')
       })
 
       fs.writeFile(file, newData, () => {})