From 5b34141cbe40a269ddc38151da0d111d1a5cf0f4 Mon Sep 17 00:00:00 2001
From: Mitchell Syer <Mitchellptbo@gmail.com>
Date: Thu, 9 Sep 2021 23:59:11 -0400
Subject: [PATCH] Fix signing settings when no Keychain is specified (#1093)

Closes #1086
---
 .../internal/validation/ValidatedMacOSSigningSettings.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt
index 3ca82fb6a1..cb90c8b9b3 100644
--- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt
+++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt
@@ -44,10 +44,10 @@ internal fun MacOSSigningSettings.validate(
     val signIdentity = this.identity.orNull
         ?: error(ERR_UNKNOWN_SIGN_ID)
     val keychainPath = this.keychain.orNull
-    val keychainFile =
-        listOf(project.file(keychainPath), project.rootProject.file(keychainPath))
-            .firstOrNull { it.exists() }
     if (keychainPath != null) {
+        val keychainFile =
+            listOf(project.file(keychainPath), project.rootProject.file(keychainPath))
+                .firstOrNull { it.exists() }
         check(keychainFile != null && keychainFile.exists()) {
             "$ERR_PREFIX could not find the specified keychain: $keychainPath"
         }