From f35b755192cf1db4f0bd6c3019fc5b963040c33b Mon Sep 17 00:00:00 2001
From: mtkennerly <mtkennerly@gmail.com>
Date: Wed, 29 Jul 2020 14:10:55 -0400
Subject: [PATCH] Release v0.6.0

---
 CHANGELOG.md |  5 +++--
 Cargo.lock   |  6 +++---
 Cargo.toml   |  2 +-
 README.md    | 24 ++++++++++++------------
 src/gui.rs   |  1 +
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94b7b278..ea298d52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Unreleased
+## v0.6.0 (2020-07-29)
 
 * Added:
   * Option to merge into an existing backup directory.
@@ -7,7 +7,8 @@
 * Fixed:
   * Registry values of type `EXPAND_SZ` and `MULTI_SZ` were converted to `SZ` when restored.
 * Changed:
-  * On Windows, the program icon is now embedded in the executable.
+  * On Windows, the program icon is now embedded in the executable so that
+    you can see it in the file browser as well.
 
 ## v0.5.0 (2020-07-25)
 
diff --git a/Cargo.lock b/Cargo.lock
index 756a85e9..03385add 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1518,7 +1518,7 @@ dependencies = [
 
 [[package]]
 name = "ludusavi"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "base64 0.12.3",
  "copypasta",
@@ -2888,9 +2888,9 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
 
 [[package]]
 name = "ttf-parser"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "299ea3f99bc2da2d8d319ede7ecee9f9f1d94fe943b1cd69a9f6654c4eae10b8"
+checksum = "d9adb8aeeaf663a49ffdf9cdb548232849174b451a22bc90921868b8491ee901"
 
 [[package]]
 name = "twox-hash"
diff --git a/Cargo.toml b/Cargo.toml
index b12f9d5c..5bcdccaf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ludusavi"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["mtkennerly <mtkennerly@gmail.com>"]
 edition = "2018"
 description = "Game save backup tool"
diff --git a/README.md b/README.md
index ee43b2e3..f91a0235 100644
--- a/README.md
+++ b/README.md
@@ -92,10 +92,8 @@ If you are on Mac:
   without actually performing it.
 * You can press `back up` to perform the backup for real.
   * If the target folder already exists, it will be deleted first,
-    then recreated.
-    <!--
-    However, if you've enabled the merge option, then it will not be deleted first.
-    -->
+    then recreated. However, if you've enabled the merge option,
+    then it will not be deleted first.
   * Within the target folder, for every game with data to back up,
     a subfolder will be created with the game's name encoded as
     [Base64](https://en.wikipedia.org/wiki/Base64).
@@ -170,8 +168,9 @@ If you are on Mac:
 ### CLI
 Run `ludusavi --help` for the full usage information.
 
-<!--
-When you use the `--api` flag, the output will have the following structure:
+CLI mode defaults to a human-readable format, but you can switch to a
+machine-readable JSON format with the `--api` flag. In that case, the output
+will have the following structure:
 
 * `errors` (optional, map):
   * `someGamesFailed` (optional, boolean): Whether any games failed.
@@ -210,11 +209,11 @@ Example:
 ```json
 {
   "errors": {
-    "some_games_failed": true,
+    "someGamesFailed": true,
   },
   "overall": {
     "totalGames": 2,
-    "totalBytes": 100,
+    "totalBytes": 150,
     "processedGames": 1,
     "processedBytes": 100,
   },
@@ -234,13 +233,16 @@ Example:
     },
     "Game 2": {
       "decision": "Ignored",
-      "files": {},
+      "files": {
+        "/games/game2/save.json": {
+          "bytes": 50
+        }
+      },
       "registry": {}
     }
   }
 }
 ```
--->
 
 ### Configuration
 Ludusavi stores its configuration in `~/.config/ludusavi` (Windows: `C:/Users/<your-name>/.config/ludusavi`).
@@ -263,10 +265,8 @@ Here are the available settings (all are required unless otherwise noted):
     This can be overridden in the CLI with `--path`.
   * `ignoredGames` (optional, array of strings): Names of games to skip when backing up.
     This can be overridden in the CLI by passing a list of games.
-  <!--
   * `merge` (optional, boolean): Whether to merge save data into the target
     directory rather than deleting the directory first. Default: false.
-  -->
 * `restore` (map):
   * `path` (string): Full path to a directory from which to restore data.
     This can be overridden in the CLI with `--path`.
diff --git a/src/gui.rs b/src/gui.rs
index c732997a..3e899adb 100644
--- a/src/gui.rs
+++ b/src/gui.rs
@@ -1624,6 +1624,7 @@ impl Application for App {
             }
             Message::EditedBackupMerge(enabled) => {
                 self.config.backup.merge = enabled;
+                self.config.save();
                 Command::none()
             }
             Message::EditedRestoreSource(text) => {