From d28090f29229762f5325532b1829655f719df73b Mon Sep 17 00:00:00 2001
From: SChernykh <15806605+SChernykh@users.noreply.github.com>
Date: Mon, 12 Feb 2024 07:25:49 +0100
Subject: [PATCH] More CI fixes

---
 .github/workflows/c-cpp.yml           | 6 +++---
 .github/workflows/codeql-analysis.yml | 2 +-
 .github/workflows/cppcheck.yml        | 2 +-
 .github/workflows/msvc-analysis.yml   | 2 +-
 src/crypto.cpp                        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 5930cb7..5c00693 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   build-alpine-static:
 
-    timeout-minutes: 120
+    timeout-minutes: 180
     runs-on: ubuntu-22.04
 
     strategy:
@@ -597,7 +597,7 @@ jobs:
 
   build-freebsd:
 
-    timeout-minutes: 75
+    timeout-minutes: 180
     runs-on: ${{ matrix.os.host }}
 
     strategy:
@@ -666,7 +666,7 @@ jobs:
 
   build-openbsd:
 
-    timeout-minutes: 75
+    timeout-minutes: 180
     runs-on: ${{ matrix.os.host }}
 
     strategy:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3952497..f3d34a7 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,7 +26,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    timeout-minutes: 60
+    timeout-minutes: 180
     runs-on: ubuntu-latest
     permissions:
       actions: read
diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
index 288f79e..ff7132b 100644
--- a/.github/workflows/cppcheck.yml
+++ b/.github/workflows/cppcheck.yml
@@ -79,7 +79,7 @@ jobs:
     - name: Build cppcheck
       run: |
         cd cppcheck-main
-        & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild.exe" /m /p:Configuration=Release /p:Platform=x64
+        & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild.exe" -v:m /m /p:Configuration=Release /p:Platform=x64
 
     - name: Setup cmake
       uses: lukka/get-cmake@latest
diff --git a/.github/workflows/msvc-analysis.yml b/.github/workflows/msvc-analysis.yml
index abe4746..416e2fa 100644
--- a/.github/workflows/msvc-analysis.yml
+++ b/.github/workflows/msvc-analysis.yml
@@ -28,7 +28,7 @@ env:
 jobs:
   analyze:
     name: Analyze
-    timeout-minutes: 60
+    timeout-minutes: 180
     runs-on: windows-latest
 
     steps:
diff --git a/src/crypto.cpp b/src/crypto.cpp
index f36883f..21b39ea 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -219,8 +219,8 @@ public:
 		{
 			WriteLock lock(derivations_lock);
 
-			DerivationEntry& entry = derivations->emplace(index, DerivationEntry{ derivation, { 0xFFFFFFFFUL, 0xFFFFFFFFUL }, {}, t }).first->second;
-			entry.add_view_tag(static_cast<uint32_t>(output_index << 8) | view_tag);
+			auto entry = derivations->emplace(index, DerivationEntry{ derivation, { 0xFFFFFFFFUL, 0xFFFFFFFFUL }, {}, t }).first;
+			entry->second.add_view_tag(static_cast<uint32_t>(output_index << 8) | view_tag);
 		}
 
 		return true;