From b07db5d3ef26d3fbb9186e10a54baf8970cc9209 Mon Sep 17 00:00:00 2001
From: jackun <jack.un@gmail.com>
Date: Fri, 31 Jul 2020 23:05:50 +0300
Subject: [PATCH] [dbus] Don't clear metadata when reloading config file

---
 src/dbus.cpp           | 2 +-
 src/dbus_info.h        | 8 --------
 src/overlay_params.cpp | 5 -----
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/dbus.cpp b/src/dbus.cpp
index a7c23911..a6fc76f8 100644
--- a/src/dbus.cpp
+++ b/src/dbus.cpp
@@ -143,7 +143,7 @@ namespace dbusmgr {
 bool dbus_manager::get_media_player_metadata(metadata& meta, std::string name) {
     if (name == "") name = m_active_player;
     if (name == "") return false;
-    meta.clear();
+    meta = {};
     dbus_get_player_property(*this, meta, name.c_str(), "Metadata");
     dbus_get_player_property(*this, meta, name.c_str(), "PlaybackStatus");
     meta.valid = (meta.artists.size() || !meta.title.empty());
diff --git a/src/dbus_info.h b/src/dbus_info.h
index f1b25332..36e48dcb 100644
--- a/src/dbus_info.h
+++ b/src/dbus_info.h
@@ -26,14 +26,6 @@ struct metadata {
     bool valid = false;
     bool got_song_data = false;
     bool got_playback_data = false;
-
-    void clear() {
-        artists.clear();
-        title.clear();
-        album.clear();
-        artUrl.clear();
-        valid = false;
-    }
 };
 
 struct mutexed_metadata {
diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp
index 47763f02..13d5b632 100644
--- a/src/overlay_params.cpp
+++ b/src/overlay_params.cpp
@@ -529,11 +529,6 @@ parse_overlay_config(struct overlay_params *params,
 
 #ifdef HAVE_DBUS
    if (params->enabled[OVERLAY_PARAM_ENABLED_media_player]) {
-      // lock mutexes for config file change notifier thread
-      {
-         std::lock_guard<std::mutex> lk(main_metadata.mtx);
-         main_metadata.meta.clear();
-      }
       dbusmgr::dbus_mgr.init(params->media_player_name);
    } else {
       dbusmgr::dbus_mgr.deinit();