From c2b753326fb6cb6460a43e401fb5731cdee1fabb Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Wed, 31 May 2023 11:59:21 +0100
Subject: [PATCH 1/3] Check if the Unreal app name follows the right format

---
 openpype/hosts/unreal/addon.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/openpype/hosts/unreal/addon.py b/openpype/hosts/unreal/addon.py
index 1119b5c16c..fddceb00a8 100644
--- a/openpype/hosts/unreal/addon.py
+++ b/openpype/hosts/unreal/addon.py
@@ -1,5 +1,7 @@
 import os
+import re
 from openpype.modules import IHostAddon, OpenPypeModule
+from openpype.widgets.message_window import Window
 
 UNREAL_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ -19,6 +21,18 @@ class UnrealAddon(OpenPypeModule, IHostAddon):
 
         from .lib import get_compatible_integration
 
+        pattern = re.compile(r'^\d+-\d+$')
+
+        if not pattern.match(app.name):
+            Window(
+                parent=None,
+                title="Unreal application name format",
+                message="Unreal application name must be in format '5-0' or '5-1'",
+                level="critical")
+            raise ValueError(
+                "Unreal application name must be in format '5-0' or '5-1'"
+            )
+
         ue_version = app.name.replace("-", ".")
         unreal_plugin_path = os.path.join(
             UNREAL_ROOT_DIR, "integration", "UE_{}".format(ue_version), "Ayon"

From 142ae35d9b81b5325c462b67cc870c959a801524 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Wed, 31 May 2023 12:13:00 +0100
Subject: [PATCH 2/3] Hound fixes

---
 openpype/hosts/unreal/addon.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/openpype/hosts/unreal/addon.py b/openpype/hosts/unreal/addon.py
index fddceb00a8..16f6fcf27c 100644
--- a/openpype/hosts/unreal/addon.py
+++ b/openpype/hosts/unreal/addon.py
@@ -24,14 +24,13 @@ class UnrealAddon(OpenPypeModule, IHostAddon):
         pattern = re.compile(r'^\d+-\d+$')
 
         if not pattern.match(app.name):
+            msg = "Unreal application name must be in format '5-0' or '5-1'"
             Window(
                 parent=None,
                 title="Unreal application name format",
-                message="Unreal application name must be in format '5-0' or '5-1'",
+                message=msg,
                 level="critical")
-            raise ValueError(
-                "Unreal application name must be in format '5-0' or '5-1'"
-            )
+            raise ValueError(msg)
 
         ue_version = app.name.replace("-", ".")
         unreal_plugin_path = os.path.join(

From 0635c39a37094bf4f78898a9a179fbf657baf021 Mon Sep 17 00:00:00 2001
From: Simone Barbieri <simone.barbieri@hey.com>
Date: Wed, 31 May 2023 14:32:24 +0100
Subject: [PATCH 3/3] Improved error message

---
 openpype/hosts/unreal/addon.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openpype/hosts/unreal/addon.py b/openpype/hosts/unreal/addon.py
index 16f6fcf27c..ed23950b35 100644
--- a/openpype/hosts/unreal/addon.py
+++ b/openpype/hosts/unreal/addon.py
@@ -24,7 +24,10 @@ class UnrealAddon(OpenPypeModule, IHostAddon):
         pattern = re.compile(r'^\d+-\d+$')
 
         if not pattern.match(app.name):
-            msg = "Unreal application name must be in format '5-0' or '5-1'"
+            msg = (
+                "Unreal application key in the settings must be in format"
+                "'5-0' or '5-1'"
+            )
             Window(
                 parent=None,
                 title="Unreal application name format",