diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6c3b132..c677b9df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
Changelog
=========
+v1.1.24
+-------
+
+ - Fix issues caused by forward slashes in folder paths (#519, #520)
+
v1.1.23
-------
diff --git a/server/version_check.php b/server/version_check.php
index 9c8023f2..7d18d3a5 100644
--- a/server/version_check.php
+++ b/server/version_check.php
@@ -65,7 +65,7 @@ function get_with_wildcard($src, $value, $default = null)
}
$versions = [
- '1.1.23' => [
+ '1.1.24' => [
'base_url' => 'https://github.com/canton7/SyncTrayzor/releases/download',
'installed' => [
'direct_download_url' => [
@@ -82,7 +82,7 @@ function get_with_wildcard($src, $value, $default = null)
'sha1sum_download_url' => "{base_url}/v{version}/sha1sum.txt.asc",
'sha512sum_download_url' => "{base_url}/v{version}/sha512sum.txt.asc",
'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v{version}',
- 'release_notes' => "- Fix some crashes (#443, #463, #468, #471)\n- Show the folder name, not ID, in the file transfers progress tooltip (#457)\n- Add tray button to rescan all folders (#465)\n- Show change in Syncthing theme without requiring refresh (#472)\n- Allow STTRACE to be set in env vars in settings (#473)\n- Fix slow memory leak (#479)",
+ 'release_notes' => "- Fix issues caused by forward slashes in folder paths (#519, #520)",
],
'1.1.21' => [
'base_url' => 'https://synctrayzor.antonymale.co.uk/download',
@@ -106,6 +106,7 @@ function get_with_wildcard($src, $value, $default = null)
];
$upgrades = [
+ // No point in upgrading from 1.1.23 for something so minor
'1.1.22' => ['to' => 'latest', 'formatter' => '5'],
'1.1.21' => ['to' => 'latest', 'formatter' => '5'],
'1.1.20' => ['to' => 'latest', 'formatter' => '5'],
diff --git a/src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionViewModel.cs b/src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionViewModel.cs
index 439b474f..6d5fe65e 100644
--- a/src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionViewModel.cs
+++ b/src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionViewModel.cs
@@ -11,8 +11,8 @@
using SyncTrayzor.Properties;
using SyncTrayzor.Services;
using SyncTrayzor.Services.Config;
-using System.Reactive.Linq;
using System.Windows.Threading;
+using System.Reactive.Linq;
namespace SyncTrayzor.Pages.ConflictResolution
{
diff --git a/src/SyncTrayzor/Services/Conflicts/ConflictFileManager.cs b/src/SyncTrayzor/Services/Conflicts/ConflictFileManager.cs
index 0863407f..72686fbb 100644
--- a/src/SyncTrayzor/Services/Conflicts/ConflictFileManager.cs
+++ b/src/SyncTrayzor/Services/Conflicts/ConflictFileManager.cs
@@ -6,9 +6,9 @@
using System.Threading.Tasks;
using Pri.LongPath;
using NLog;
-using System.Reactive.Linq;
using SyncTrayzor.Syncthing.Devices;
using SyncTrayzor.Syncthing;
+using System.Reactive.Linq;
namespace SyncTrayzor.Services.Conflicts
{
diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
index 78c6b9c2..d464cee6 100644
--- a/src/SyncTrayzor/SyncTrayzor.csproj
+++ b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -154,31 +154,27 @@
-
- ..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll
- True
+
+ ..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll
-
- ..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll
- True
+
+ ..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll
-
- ..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll
- True
+
+ ..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll
-
- ..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll
- True
+
+ ..\packages\System.Reactive.PlatformServices.3.1.1\lib\net45\System.Reactive.PlatformServices.dll
-
- ..\packages\Rx-XAML.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll
- True
+
+ ..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll
..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll
+
diff --git a/src/SyncTrayzor/Syncthing/Folders/SyncthingFolderManager.cs b/src/SyncTrayzor/Syncthing/Folders/SyncthingFolderManager.cs
index 2898aee6..6828b554 100644
--- a/src/SyncTrayzor/Syncthing/Folders/SyncthingFolderManager.cs
+++ b/src/SyncTrayzor/Syncthing/Folders/SyncthingFolderManager.cs
@@ -155,6 +155,8 @@ private async Task> FetchFoldersAsync(Config config, string
// Strip off UNC prefix, if they're put it on
if (path.StartsWith(uncPrefix))
path = path.Substring(uncPrefix.Length);
+ // Change forward slashes to backslashes
+ path = path.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
if (path.StartsWith("~"))
path = Path.Combine(tilde, path.Substring(1).TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar));
diff --git a/src/SyncTrayzor/packages.config b/src/SyncTrayzor/packages.config
index 595c9513..9cfc4977 100644
--- a/src/SyncTrayzor/packages.config
+++ b/src/SyncTrayzor/packages.config
@@ -15,15 +15,14 @@
-
-
-
-
-
-
-
+
+
+
+
+
+