Skip to content
Snippets Groups Projects
Commit d6843d0c authored by Mirko Wächter's avatar Mirko Wächter
Browse files

Merge branch 'master' of https://gitlab.com/ArmarX/ArmarXGui

parents d2a12bbc 8c66be24
No related branches found
No related tags found
No related merge requests found
......@@ -159,13 +159,13 @@ void EditDefaultValueDialog::onImportInternalJson()
catch(VariantJsonException& ex)
{
QMessageBox msgBox;
msgBox.setText(QString("Error: ") + QString::fromStdString(ex.what()));
msgBox.setText(QString("Error: ") + QString::fromStdString(ex.getReason()));
msgBox.exec();
}
catch(LocalException& ex)
{
QMessageBox msgBox;
msgBox.setText(QString("Error: ") + QString::fromStdString(ex.what()));
msgBox.setText(QString("Error: ") + QString::fromStdString(ex.getReason()));
msgBox.exec();
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment