From 7336bdd9067bbf8bcd9d7f77723e58ff6af50218 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@etlcpp.com>
Date: Sat, 24 Feb 2024 11:26:02 +0000
Subject: [PATCH] Sync to 20.38.11

---
 library.json       |  4 ++--
 library.properties |  4 ++--
 src/etl/optional.h | 10 ++++++++--
 src/etl/version.h  |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/library.json b/library.json
index a79a990..69f6941 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
-  "name": "Embedded Template Library - Arduino",
-  "version": "20.38.10",
+  "name": "Embedded Template Library ETL",
+  "version": "20.38.11",
   "authors": {
     "name": "John Wellbelove",
     "email": "john.wellbelove@etlcpp.com"
diff --git a/library.properties b/library.properties
index 043882b..d13b639 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
-name=Embedded Template Library - Arduino
-version=20.38.10
+name=Embedded Template Library ETL
+version=20.38.11
 author= John Wellbelove <john.wellbelove@etlcpp.com>
 maintainer=John Wellbelove <john.wellbelove@etlcpp.com>
 license=MIT
diff --git a/src/etl/optional.h b/src/etl/optional.h
index d85763d..6431efb 100644
--- a/src/etl/optional.h
+++ b/src/etl/optional.h
@@ -768,7 +768,10 @@ namespace etl
     {
       if (this != &other)
       {
-        storage.value = other.storage.value;
+        if (other.valid)
+        {
+          storage.value = other.storage.value;
+        }
         valid = other.valid;
       }
 
@@ -783,7 +786,10 @@ namespace etl
     {
       if (this != &other)
       {
-        storage.value = etl::move(other.storage.value);
+        if (other.valid)
+        {
+          storage.value = etl::move(other.storage.value);
+        }
         valid = other.valid;
       }
 
diff --git a/src/etl/version.h b/src/etl/version.h
index 1a4e347..eb1b2fb 100644
--- a/src/etl/version.h
+++ b/src/etl/version.h
@@ -40,7 +40,7 @@ SOFTWARE.
 
 #define ETL_VERSION_MAJOR 20
 #define ETL_VERSION_MINOR 38
-#define ETL_VERSION_PATCH 10
+#define ETL_VERSION_PATCH 11
 
 #define ETL_VERSION       ETL_STRING(ETL_VERSION_MAJOR) "." ETL_STRING(ETL_VERSION_MINOR) "." ETL_STRING(ETL_VERSION_PATCH)
 #define ETL_VERSION_W     ETL_WIDE_STRING(ETL_VERSION_MAJOR) L"." ETL_WIDE_STRING(ETL_VERSION_MINOR) L"." ETL_WIDE_STRING(ETL_VERSION_PATCH)