From c7893b16f940693d0a9ff981807c4cf7639c33c0 Mon Sep 17 00:00:00 2001
From: "Luke D. Jones" <luke@ljones.dev>
Date: Thu, 8 Dec 2022 11:14:01 +1300
Subject: [PATCH] Fix: ROGCC: Remove unwrap causing panic on main thread

Closes #293
---
 CHANGELOG.md                                |  3 +++
 Cargo.lock                                  | 18 +++++++++---------
 Cargo.toml                                  |  2 +-
 rog-control-center/src/update_and_notify.rs |  2 +-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b96d239e..a6f03434 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## [v4.5.5]
+- remove an unwrap() causing panic on main ROGCC thread
+
 ## [v4.5.4]
 ### Changed
 - ROGCC:: Allow ROGCC to run without supergfxd
diff --git a/Cargo.lock b/Cargo.lock
index bcdd9119..3ce76bc7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -149,7 +149,7 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
 
 [[package]]
 name = "asusctl"
-version = "4.5.4"
+version = "4.5.5"
 dependencies = [
  "daemon",
  "gif",
@@ -727,7 +727,7 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
 
 [[package]]
 name = "daemon"
-version = "4.5.4"
+version = "4.5.5"
 dependencies = [
  "async-trait",
  "concat-idents",
@@ -750,7 +750,7 @@ dependencies = [
 
 [[package]]
 name = "daemon-user"
-version = "4.5.4"
+version = "4.5.5"
 dependencies = [
  "dirs",
  "rog_anime",
@@ -2593,7 +2593,7 @@ dependencies = [
 
 [[package]]
 name = "rog-control-center"
-version = "4.5.4"
+version = "4.5.5"
 dependencies = [
  "daemon",
  "dirs",
@@ -2624,7 +2624,7 @@ dependencies = [
 
 [[package]]
 name = "rog_anime"
-version = "4.5.4"
+version = "4.5.5"
 dependencies = [
  "gif",
  "glam",
@@ -2639,7 +2639,7 @@ dependencies = [
 
 [[package]]
 name = "rog_aura"
-version = "4.5.4"
+version = "4.5.5"
 dependencies = [
  "serde",
  "serde_derive",
@@ -2650,7 +2650,7 @@ dependencies = [
 
 [[package]]
 name = "rog_dbus"
-version = "4.5.4"
+version = "4.5.5"
 dependencies = [
  "rog_anime",
  "rog_aura",
@@ -2661,7 +2661,7 @@ dependencies = [
 
 [[package]]
 name = "rog_platform"
-version = "4.5.4"
+version = "4.5.5"
 dependencies = [
  "concat-idents",
  "inotify",
@@ -2677,7 +2677,7 @@ dependencies = [
 
 [[package]]
 name = "rog_profiles"
-version = "4.5.4"
+version = "4.5.5"
 dependencies = [
  "serde",
  "serde_derive",
diff --git a/Cargo.toml b/Cargo.toml
index ce6d7889..0d526527 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 members = ["asusctl", "daemon", "daemon-user", "rog-platform", "rog-dbus", "rog-anime", "rog-aura", "rog-profiles", "rog-control-center"]
 
 [workspace.package]
-version = "4.5.4"
+version = "4.5.5"
 
 [workspace.dependencies]
 async-trait = "^0.1"
diff --git a/rog-control-center/src/update_and_notify.rs b/rog-control-center/src/update_and_notify.rs
index 7bf6991d..8c2664b7 100644
--- a/rog-control-center/src/update_and_notify.rs
+++ b/rog-control-center/src/update_and_notify.rs
@@ -279,7 +279,7 @@ pub fn start_notifications(
 
     if let Ok(lock) = page_states.try_lock() {
         use supergfxctl::pci_device::Device;
-        let dev = Device::find().unwrap();
+        let dev = Device::find().unwrap_or_default();
         let mut found_dgpu = false; // just for logging
         for dev in dev {
             if dev.is_dgpu() {