Merge pull request #1854 from Flow-Launcher/taooceros-patch-1

jjw24 · web-flow · commit d40ff120e58a · 2023-02-06T13:39:20.000+11:00
Fix Error of loading backup when original file doesn't exists
diff --git a/Flow.Launcher.Infrastructure/Storage/JsonStorage.cs b/Flow.Launcher.Infrastructure/Storage/JsonStorage.cs
@@ -77,7 +77,11 @@ private T LoadDefault()
                 if (data != null)
                 {
                     Log.Info($"|JsonStorage.Load|Failed to load settings.json, {BackupFilePath} restored successfully");
-                    File.Replace(BackupFilePath, FilePath, null);
+                    
+                    if(File.Exists(FilePath))
+                        File.Replace(BackupFilePath, FilePath, null);
+                    else
+                        File.Move(BackupFilePath, FilePath);
 
                     return data;
                 }

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,11 @@ private T LoadDefault()`
`77`	`77`	`if (data != null)`
`78`	`78`	`{`
`79`	`79`	`Log.Info($"\|JsonStorage.Load\|Failed to load settings.json, {BackupFilePath} restored successfully");`
`80`		`- File.Replace(BackupFilePath, FilePath, null);`
	`80`	`+`
	`81`	`+ if(File.Exists(FilePath))`
	`82`	`+ File.Replace(BackupFilePath, FilePath, null);`
	`83`	`+ else`
	`84`	`+ File.Move(BackupFilePath, FilePath);`
`81`	`85`
`82`	`86`	`return data;`
`83`	`87`	`}`