3 files changed, 8 insertions, 5 deletions
diff --git a/src/ui/dialog/controller/SmartCardControllerDialog.cpp b/src/ui/dialog/controller/SmartCardControllerDialog.cpp
index 254ed83c..530f2e7e 100644
--- a/src/ui/dialog/controller/SmartCardControllerDialog.cpp
+++ b/src/ui/dialog/controller/SmartCardControllerDialog.cpp
@@ -148,7 +148,10 @@ SmartCardControllerDialog::SmartCardControllerDialog(QWidget* parent)
   timer_ = new QTimer(this);
   connect(timer_, &QTimer::timeout, this,
           &SmartCardControllerDialog::slot_listen_smart_card_changes);
-  timer_->start(3000);
+
+  if (scd_version_supported_) {
+    timer_->start(3000);
+  }
 
   setWindowTitle(tr("Smart Card Controller"));
 }
diff --git a/src/ui/dialog/settings/SettingsKeyServer.cpp b/src/ui/dialog/settings/SettingsKeyServer.cpp
index c35900cc..8088b690 100644
--- a/src/ui/dialog/settings/SettingsKeyServer.cpp
+++ b/src/ui/dialog/settings/SettingsKeyServer.cpp
@@ -234,10 +234,10 @@ void KeyserverTab::slot_test_listed_key_server() {
       &GpgFrontend::UI::ListedKeyServerTestTask::SignalKeyServerListTestResult,
       this,
       [=](QContainer<ListedKeyServerTestTask::KeyServerTestResultType> result) {
-        const size_t row_size = ui_->keyServerListTable->rowCount();
-        if (result.size() != row_size) return;
+        const auto row_size = ui_->keyServerListTable->rowCount();
+        if (result.size() != static_cast<qsizetype>(row_size)) return;
         ui_->keyServerListTable->blockSignals(true);
-        for (size_t i = 0; i < row_size; i++) {
+        for (auto i = 0; i < row_size; i++) {
           const auto status = result[i];
           auto* status_iem = ui_->keyServerListTable->item(i, 3);
           if (status == ListedKeyServerTestTask::kTEST_RESULT_TYPE_SUCCESS) {
diff --git a/src/ui/thread/KeyServerImportTask.cpp b/src/ui/thread/KeyServerImportTask.cpp
index d6450e83..f977fe62 100644
--- a/src/ui/thread/KeyServerImportTask.cpp
+++ b/src/ui/thread/KeyServerImportTask.cpp
@@ -96,7 +96,7 @@ void GpgFrontend::UI::KeyServerImportTask::dealing_reply_from_server() {
   emit SignalKeyServerImportResult(current_gpg_context_channel_, true,
                                    tr("Success"), buffer, info);
 
-  if (static_cast<size_t>(result_count_++) == keyids_.size() - 1) {
+  if (static_cast<qsizetype>(result_count_++) == keyids_.size() - 1) {
     emit SignalTaskShouldEnd(0);
   }
 }
 \ No newline at end of file