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

Change-Id: I3b6a4bd860c11324d989818d9010f07faaac677a

1 files changed, 5 insertions, 2 deletions

diff --git a/src/plugins/ctfvisualizer/ctfvisualizertool.cpp b/src/plugins/ctfvisualizer/ctfvisualizertool.cpp
index c5ca64eeb31..8ac7e819f1b 100644
--- 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();