make sure to check the promise

1 files changed, 6 insertions, 2 deletions

diff --git a/src/map/sprite.cpp b/src/map/sprite.cpp
index 1cbc220ac4..68453de52b 100644
--- a/src/map/sprite.cpp
+++ b/src/map/sprite.cpp
@@ -67,7 +67,9 @@ void Sprite::load() {
             sprite->complete();
         } else {
             Log::Warning(Event::Sprite, "Failed to load sprite info: Error %d: %s", res->code, res->error_message.c_str());
-            sprite->promise.set_exception(std::make_exception_ptr(std::runtime_error(res->error_message)));
+            if (!sprite->future.valid()) {
+                sprite->promise.set_exception(std::make_exception_ptr(std::runtime_error(res->error_message)));
+            }
         }
     });
 
@@ -78,7 +80,9 @@ void Sprite::load() {
             sprite->complete();
         } else {
             Log::Warning(Event::Sprite, "Failed to load sprite image: Error %d: %s", res->code, res->error_message.c_str());
-            sprite->promise.set_exception(std::make_exception_ptr(std::runtime_error(res->error_message)));
+            if (!sprite->future.valid()) {
+                sprite->promise.set_exception(std::make_exception_ptr(std::runtime_error(res->error_message)));
+            }
         }
     });
 }