diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e4c63b19..b4ff38e42 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) if(NOT EXISTS ${CMAKE_SOURCE_DIR}/cmake/modules/VersionInfo.cmake) message(FATAL_ERROR "cmake submodule directory empty, did you 'git clone --recursive'?") endif() -project(qdigidoc4 VERSION 4.6.0) +project(qdigidoc4 VERSION 4.6.1) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/client/QCNG.cpp b/client/QCNG.cpp index a4bd40489..ac91ac13a 100644 --- a/client/QCNG.cpp +++ b/client/QCNG.cpp @@ -217,7 +217,10 @@ QList QCNG::tokens() const continue; if(reader.isEmpty()) - reader = QString::fromUtf16((const char16_t*)prop(key, NCRYPT_READER_PROPERTY).data()); + { + if(QByteArray tmp = prop(key, NCRYPT_READER_PROPERTY); !tmp.isEmpty()) + reader = QString::fromUtf16((const char16_t*)tmp.data()); + } QString guid = prop(h, NCRYPT_SMARTCARD_GUID_PROPERTY).trimmed(); TokenData &t = result.emplaceBack(); t.setReader(reader);