From 51e9f10087768a66482493c28247a95fc2857e41 Mon Sep 17 00:00:00 2001
From: "Luke D. Jones" <luke@ljones.dev>
Date: Tue, 21 Jan 2025 16:41:28 +1300
Subject: [PATCH] Prep 6.1.0-rc7

---
 CHANGELOG.md                     |  3 +++
 Cargo.lock                       | 28 ++++++++++++++--------------
 Cargo.toml                       |  2 +-
 rog-control-center/src/ui/mod.rs |  2 +-
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf17e72a..2492d3cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,11 +2,14 @@
 
 ## [Unreleased]
 
+## [v6.1.0-rc7]
+
 - Refactor PPT handling more:
   1. Per profile, per-ac/dc
   2. Do not apply unless group is enabled
   3. Better reset/disable handling
   4. Selecting a profile defaults PPT to off/disabled
+- Bugfix: prevent an AniMe thread async deadlock
 
 ## [v6.1.0-rc6]
 
diff --git a/Cargo.lock b/Cargo.lock
index 40df4451..98cd6926 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -176,7 +176,7 @@ dependencies = [
 
 [[package]]
 name = "asusctl"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "dmi_id",
  "env_logger",
@@ -195,7 +195,7 @@ dependencies = [
 
 [[package]]
 name = "asusd"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "cargo-husky",
  "concat-idents",
@@ -221,7 +221,7 @@ dependencies = [
 
 [[package]]
 name = "asusd-user"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "config-traits",
  "dirs",
@@ -901,7 +901,7 @@ dependencies = [
 
 [[package]]
 name = "config-traits"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "log",
  "ron",
@@ -1293,7 +1293,7 @@ dependencies = [
 
 [[package]]
 name = "dmi_id"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "log",
  "udev 0.8.0",
@@ -4092,7 +4092,7 @@ dependencies = [
 
 [[package]]
 name = "rog-control-center"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "asusd",
  "concat-idents",
@@ -4122,7 +4122,7 @@ dependencies = [
 
 [[package]]
 name = "rog_anime"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "dmi_id",
  "gif 0.12.0",
@@ -4136,7 +4136,7 @@ dependencies = [
 
 [[package]]
 name = "rog_aura"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "dmi_id",
  "log",
@@ -4147,7 +4147,7 @@ dependencies = [
 
 [[package]]
 name = "rog_dbus"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "asusd",
  "rog_anime",
@@ -4161,7 +4161,7 @@ dependencies = [
 
 [[package]]
 name = "rog_platform"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "concat-idents",
  "inotify",
@@ -4174,7 +4174,7 @@ dependencies = [
 
 [[package]]
 name = "rog_profiles"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "log",
  "rog_platform",
@@ -4185,7 +4185,7 @@ dependencies = [
 
 [[package]]
 name = "rog_scsi"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "ron",
  "serde",
@@ -4195,7 +4195,7 @@ dependencies = [
 
 [[package]]
 name = "rog_simulators"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "log",
  "rog_anime",
@@ -4205,7 +4205,7 @@ dependencies = [
 
 [[package]]
 name = "rog_slash"
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 dependencies = [
  "dmi_id",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index aeeddd73..336ccef8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "6.1.0-rc6"
+version = "6.1.0-rc7"
 rust-version = "1.82"
 license = "MPL-2.0"
 readme = "README.md"
diff --git a/rog-control-center/src/ui/mod.rs b/rog-control-center/src/ui/mod.rs
index cf06a631..67677cf1 100644
--- a/rog-control-center/src/ui/mod.rs
+++ b/rog-control-center/src/ui/mod.rs
@@ -84,7 +84,7 @@ pub fn show_toast(
 
 pub fn setup_window(config: Arc<Mutex<Config>>) -> MainWindow {
     slint::set_xdg_app_id("rog-control-center")
-        .map_err(warn!("Couldn't set application ID: {e:?}"))
+        .map_err(|e| warn!("Couldn't set application ID: {e:?}"))
         .ok();
     let ui = MainWindow::new().unwrap();
     if let Ok(lock) = config.try_lock() {