From 42794079bf98ef6a7ce3854fc443f539bac7e9ce Mon Sep 17 00:00:00 2001
From: Joel Klinghed <the_jk@spawned.biz>
Date: Wed, 29 Oct 2025 09:24:28 +0100
Subject: bt: Avoid crashes for MediaPlayerTrack

Doing two things:
* Remove experimental and unused field ImgHandle field
* Handle variant being empty
---
 src/bt.cc | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/bt.cc')

diff --git a/src/bt.cc b/src/bt.cc
index ad05a87..0f81590 100644
--- a/src/bt.cc
+++ b/src/bt.cc
@@ -48,7 +48,6 @@ struct MediaPlayerTrack {
   std::string Genre;
   uint32_t NumberOfTracks;
   uint32_t Duration;
-  std::string ImgHandle;
 };
 
 }  // namespace
@@ -59,7 +58,7 @@ struct sdbus::signature_of<Void> : sdbus::signature_of<void> {};
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-function"
 SDBUSCPP_REGISTER_STRUCT_NO_THROW(MediaPlayerTrack, Title, Artist, Album, Genre,
-                                  NumberOfTracks, Duration, ImgHandle);
+                                  NumberOfTracks, Duration);
 #pragma clang diagnostic pop
 
 namespace bt {
@@ -726,7 +725,11 @@ class MediaPlayerProxy : public BaseProxy, public Player {
         break;
       }
       case 1:
-        track_ = value.get<MediaPlayerTrack>();
+        if (value.isEmpty()) {
+          track_ = MediaPlayerTrack{};
+        } else {
+          track_ = value.get<MediaPlayerTrack>();
+        }
         break;
       case 2:
         device_ = value.get<sdbus::ObjectPath>();
-- 
cgit v1.2.3-70-g09d2