From cf5877073a979d7997ad72b9b3c8a4423f4f6f14 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 5 Nov 2022 20:20:28 +0100 Subject: [PATCH] fix: don't escape mpd label twice Signed-off-by: Sefa Eyeoglu --- src/modules/mpd/mpd.cpp | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/modules/mpd/mpd.cpp b/src/modules/mpd/mpd.cpp index 7566284..04d7a46 100644 --- a/src/modules/mpd/mpd.cpp +++ b/src/modules/mpd/mpd.cpp @@ -170,16 +170,14 @@ void waybar::modules::MPD::setLabel() { try { label_->set_markup(fmt::format( - format, fmt::arg("artist", Glib::Markup::escape_text(artist).raw()), - fmt::arg("albumArtist", Glib::Markup::escape_text(album_artist).raw()), - fmt::arg("album", Glib::Markup::escape_text(album).raw()), - fmt::arg("title", Glib::Markup::escape_text(title).raw()), - fmt::arg("date", Glib::Markup::escape_text(date).raw()), fmt::arg("volume", volume), - fmt::arg("elapsedTime", elapsedTime), fmt::arg("totalTime", totalTime), - fmt::arg("songPosition", song_pos), fmt::arg("queueLength", queue_length), - fmt::arg("stateIcon", stateIcon), fmt::arg("consumeIcon", consumeIcon), - fmt::arg("randomIcon", randomIcon), fmt::arg("repeatIcon", repeatIcon), - fmt::arg("singleIcon", singleIcon), fmt::arg("filename", filename))); + format, fmt::arg("artist", artist.raw()), fmt::arg("albumArtist", album_artist.raw()), + fmt::arg("album", album.raw()), fmt::arg("title", title.raw()), fmt::arg("date", date), + fmt::arg("volume", volume), fmt::arg("elapsedTime", elapsedTime), + fmt::arg("totalTime", totalTime), fmt::arg("songPosition", song_pos), + fmt::arg("queueLength", queue_length), fmt::arg("stateIcon", stateIcon), + fmt::arg("consumeIcon", consumeIcon), fmt::arg("randomIcon", randomIcon), + fmt::arg("repeatIcon", repeatIcon), fmt::arg("singleIcon", singleIcon), + fmt::arg("filename", filename))); } catch (fmt::format_error const& e) { spdlog::warn("mpd: format error: {}", e.what()); }