refs #922, refs #911, JSON cut/copy/paste

* utility function for CVariant
* use CVariant for cut/copy/paste
This commit is contained in:
Klaus Basan
2017-03-24 18:24:59 +01:00
committed by Mathew Sutcliffe
parent 5ba438699f
commit 08f8916344
6 changed files with 24 additions and 8 deletions

View File

@@ -117,8 +117,10 @@ namespace BlackGui
{
try
{
CLiveryList liveries;
liveries.convertFromJson(Json::jsonObjectFromString(json));
CVariant jsonVariant;
jsonVariant.convertFromJson(Json::jsonObjectFromString(json));
if (!jsonVariant.canConvert<CLiveryList>()) { return; }
const CLiveryList liveries = jsonVariant.value<CLiveryList>();
if (!liveries.isEmpty())
{
this->setValue(liveries.front());