From e113ffc2b1be1fb1dbf467e208ea2f8fa880ae3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20H=C3=A4rter?= <sha@rother-oss.com>
Date: Wed, 22 Jan 2025 14:58:42 +0100
Subject: [PATCH] Issue #3845: Fixed activity config fetching for newly created
 activities.

---
 Kernel/Modules/AdminProcessManagementActivity.pm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/Kernel/Modules/AdminProcessManagementActivity.pm b/Kernel/Modules/AdminProcessManagementActivity.pm
index 01fd84bc36..d8f3d3a41e 100644
--- a/Kernel/Modules/AdminProcessManagementActivity.pm
+++ b/Kernel/Modules/AdminProcessManagementActivity.pm
@@ -46,17 +46,17 @@ sub Run {
     my $ActivityID = $ParamObject->GetParam( Param => 'ID' )       || '';
     my $EntityID   = $ParamObject->GetParam( Param => 'EntityID' ) || '';
 
-    # get latest config data to send it back to main window
-    my $ActivityConfig = $Self->_GetActivityConfig(
-        EntityID => $EntityID,
-    );
-
     my %SessionData = $Kernel::OM->Get('Kernel::System::AuthSession')->GetSessionIDData(
         SessionID => $Self->{SessionID},
     );
 
     if ( !exists $SessionData{ProcessManagementScreensPath} ) {
 
+        # get latest config data to send it back to main window
+        my $ActivityConfig = $Self->_GetActivityConfig(
+            EntityID => $EntityID,
+        );
+
         # we lost session in between, close the popup and reload
         return $Self->_PopupResponse(
             ClosePopup => 1,
@@ -211,6 +211,11 @@ sub Run {
 
         my $Redirect = $ParamObject->GetParam( Param => 'PopupRedirect' ) || '';
 
+        # get latest config data to send it back to main window
+        my $ActivityConfig = $Self->_GetActivityConfig(
+            EntityID => $EntityID,
+        );
+
         # check if needed to open another window or if popup should go back
         if ( $Redirect && $Redirect eq '1' ) {