diff --git a/3rdparty/libshv b/3rdparty/libshv index 0b6cec1..bc8c0a8 160000 --- a/3rdparty/libshv +++ b/3rdparty/libshv @@ -1 +1 @@ -Subproject commit 0b6cec1f0665d41859ea9285f62fca3d8c13f7cf +Subproject commit bc8c0a89e55a44d3c55abc70064520b7e280d720 diff --git a/shvspy/src/appversion.h b/shvspy/src/appversion.h index 04e7e3b..2f15a71 100644 --- a/shvspy/src/appversion.h +++ b/shvspy/src/appversion.h @@ -1,4 +1,4 @@ #pragma once -#define APP_VERSION "1.10.0" +#define APP_VERSION "1.10.1" diff --git a/shvspy/src/mainwindow.cpp b/shvspy/src/mainwindow.cpp index f61b311..d0b2c19 100644 --- a/shvspy/src/mainwindow.cpp +++ b/shvspy/src/mainwindow.cpp @@ -417,20 +417,12 @@ void MainWindow::displayValue(const shv::chainpack::RpcValue &rv) view->setAttribute(Qt::WA_DeleteOnClose); view->setWindowIconText(tr("Result")); view->setReadOnly(true); - const char* blob; - size_t size; if (rv.isString()) { - blob = rv.asString().data(); - size = rv.asString().size(); - } else { - blob = reinterpret_cast(rv.asBlob().data()); - size = rv.asBlob().size(); - } - auto data = QByteArray::fromRawData(blob, size); - if (rv.isString()) { - view->setText(QString::fromUtf8(data)); + view->setText(QString::fromStdString(rv.asString())); } else { + const auto &blob = rv.asBlob(); + auto data = QByteArray::fromRawData(reinterpret_cast(blob.data()), blob.size()); view->setBlob(data); } view->show();