From b5323db9e08e6b6b4c9c1dad3c54e979794d10e4 Mon Sep 17 00:00:00 2001
From: Rubidium <rubidium@openttd.org>
Date: Sun, 27 Apr 2025 20:21:31 +0200
Subject: [PATCH] Fix 29ceaf0a8: checking std::optional against nullptr caused
 crash

---
 src/base_media_func.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/base_media_func.h b/src/base_media_func.h
index 880c242aa9..ea19f10c4b 100644
--- a/src/base_media_func.h
+++ b/src/base_media_func.h
@@ -339,8 +339,8 @@ template <class Tbase_set> std::optional<std::string_view> TryGetBaseSetFile(con
 template <class Tbase_set>
 /* static */ bool BaseMedia<Tbase_set>::HasSet(const ContentInfo &ci, bool md5sum)
 {
-	return (TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::available_sets) != nullptr) ||
-			(TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::duplicate_sets) != nullptr);
+	return TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::available_sets).has_value() ||
+			TryGetBaseSetFile(ci, md5sum, BaseMedia<Tbase_set>::duplicate_sets).has_value();
 }
 
 /**