From 8a8011e96f4e58f00571ef9032d6c1361e3689a3 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 7 Oct 2024 09:55:14 +0200 Subject: [PATCH] fix: don't add tooltip item if it's empty + fix encoding --- src/rccore/rc_convert.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rccore/rc_convert.cpp b/src/rccore/rc_convert.cpp index 4ac48689..71a38eb4 100644 --- a/src/rccore/rc_convert.cpp +++ b/src/rccore/rc_convert.cpp @@ -160,12 +160,15 @@ static Widget convertPushButton(const Data &data, const QString &dialogId, Data: const auto &values = it->values.value(control.id); if (values.count() == 1) { pugi::xml_document document; - const pugi::xml_parse_result result = document.load_string(values.constFirst().toLatin1().constData(), + const pugi::xml_parse_result result = document.load_string(values.constFirst().toLocal8Bit().constData(), pugi::parse_default | pugi::parse_declaration); if (result) { const auto node = document.select_node("MFCButton_Tooltip"); if (!node.node().empty()) { - widget.properties["toolTip"] = node.node().text().as_string(); + const QString toolTip = QString::fromLatin1(node.node().text().as_string()); + if (!toolTip.isEmpty()) { + widget.properties["toolTip"] = toolTip; + } } } }