diff --git a/CMakeLists.txt b/CMakeLists.txt index 571b3a4..7aff841 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5) project(airsaned) diff --git a/server/scanjob.cpp b/server/scanjob.cpp index 38b20f4..e79c100 100644 --- a/server/scanjob.cpp +++ b/server/scanjob.cpp @@ -337,7 +337,7 @@ ScanJob::Private::init(const ScanSettingsXml& settings, bool autoselectFormat, c const char* ScanJob::Private::kindString() const { - switch (mKind) { + switch (mKind.load()) { case single: return "single"; case adfConcat: @@ -499,7 +499,7 @@ ScanJob::Private::updateStatus(SANE_Status status) mStateReason = PWG_JOB_CANCELED_BY_USER; break; case SANE_STATUS_EOF: - switch(mKind) { + switch(mKind.load()) { case single: if (mImagesCompleted > 0) { mState = completed;