diff --git a/.clang-tidy b/.clang-tidy
index 7a117e62..a88cf6b3 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,6 +1,6 @@
 ---
 # -bugprone-chained-comparison is needed for catch2 < v3.5.3
-Checks:          'bugprone-*,-bugprone-assignment-in-if-condition,-bugprone-chained-comparison,-bugprone-easily-swappable-parameters,-bugprone-implicit-widening-of-multiplication-result,-bugprone-multi-level-implicit-pointer-conversion,-bugprone-narrowing-conversions,-bugprone-suspicious-enum-usage,-bugprone-switch-missing-default-case,clang-diagnostic-*,clang-analyzer-*,misc-throw-by-value-catch-by-reference,modernize-use-nullptr,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-override,performance-*,-performance-enum-size'
+Checks:          'bugprone-*,-bugprone-chained-comparison,-bugprone-easily-swappable-parameters,-bugprone-implicit-widening-of-multiplication-result,-bugprone-multi-level-implicit-pointer-conversion,-bugprone-narrowing-conversions,-bugprone-suspicious-enum-usage,-bugprone-switch-missing-default-case,clang-diagnostic-*,clang-analyzer-*,misc-throw-by-value-catch-by-reference,modernize-use-nullptr,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-override,performance-*,-performance-enum-size'
 WarningsAsErrors: '*'
 HeaderFilterRegex: '/CorsixTH/Src/|/AnimView/|/common/'
 FormatStyle:     file
diff --git a/CorsixTH/Src/xmi2mid.cpp b/CorsixTH/Src/xmi2mid.cpp
index 00516773..8b46867b 100644
--- a/CorsixTH/Src/xmi2mid.cpp
+++ b/CorsixTH/Src/xmi2mid.cpp
@@ -310,7 +310,8 @@ uint8_t* transcode_xmi_to_midi(const unsigned char* xmi_data, size_t xmi_length,
       return nullptr;
     iTokenTime = itr->time;
     if (itr->type >= 0xF0) {
-      if (!bufOutput.write(iTokenType = itr->type)) return nullptr;
+      iTokenType = itr->type;
+      if (!bufOutput.write(iTokenType)) return nullptr;
       if (iTokenType == 0xFF) {
         if (!bufOutput.write(itr->data)) return nullptr;
         if (itr->data == 0x2F) bEnd = true;
@@ -320,7 +321,8 @@ uint8_t* transcode_xmi_to_midi(const unsigned char* xmi_data, size_t xmi_length,
       if (!bufOutput.write(itr->buffer, itr->buffer_length)) return nullptr;
     } else {
       if (itr->type != iTokenType) {
-        if (!bufOutput.write(iTokenType = itr->type)) return nullptr;
+        iTokenType = itr->type;
+        if (!bufOutput.write(iTokenType)) return nullptr;
       }
       if (!bufOutput.write(itr->data)) return nullptr;
       if (itr->buffer) {