Merge remote-tracking branch 'origin/11.0' into HEAD

Change-Id: I3b6a4bd860c11324d989818d9010f07faaac677a
2023-09-12 09:46:28 +02:00
parent dab19c4a8c 91b67da6da
commit 7bb8f59587
6 changed files with 10 additions and 7 deletions
--- a/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
+++ b/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
@@ -161,8 +161,11 @@ void CtfVisualizerTool::loadJson()
    auto *task = new QFuture<void>(futureInterface);

    QThread *thread = QThread::create([this, filename, futureInterface]() {
-        m_traceManager->load(filename);
-
+        try {
+            m_traceManager->load(filename);
+        } catch (...) {
+            // nlohmann::json can throw exceptions when requesting type that is wrong
+        }
        m_modelAggregator->moveToThread(QApplication::instance()->thread());
        m_modelAggregator->setParent(this);
        futureInterface->reportFinished();