From a071aff2f0a727fd30021e664b6b0d4347ec7f95 Mon Sep 17 00:00:00 2001
From: Digital Data - Marlon Schreiber <m.schreiber@digitaldata.works>
Date: Mon, 4 Oct 2021 15:42:26 +0200
Subject: [PATCH] MS ClickedProfileID und Title Safety

---
 app/DD_PM_WINDREAM/frmMain.vb | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb
index e5d3792..7a7596a 100644
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@@ -1173,12 +1173,7 @@ Public Class frmMain
             TimerRefresh.Stop()
 
             If GRID_LOAD_TYPE = "OVERVIEW" Then
-                For Each orow As DataRow In CURRENT_DT_PROFILES.Rows
-                    If orow.Item("GUID") = CURRENT_CLICKED_PROFILE_ID Then
-                        CURRENT_CLICKED_PROFILE_TITLE = orow.Item("TITLE")
-                        Exit For
-                    End If
-                Next
+
                 Await Load_Grid_Overview(pIsFormLoad, ForceReload)
             ElseIf GRID_LOAD_TYPE.StartsWith("PROFILE#") Then
                 Await Load_single_Profile(ForceReload)
@@ -1468,7 +1463,11 @@ Public Class frmMain
             End If
             If Len(oHitProfilID) > 0 Then
                 If oHitProfilID > 0 Then
-                    CURRENT_CLICKED_PROFILE_ID = oHitProfilID
+                    If oHitProfilID <> CURRENT_CLICKED_PROFILE_ID Then
+                        LOGGER.Debug($"Item_Scope: oHitProfilID {oHitProfilID} <> CURRENT_CLICKED_PROFILE_ID {CURRENT_CLICKED_PROFILE_ID} ")
+                        CURRENT_CLICKED_PROFILE_ID = oHitProfilID
+                    End If
+
                 End If
             End If
 
@@ -1480,7 +1479,7 @@ Public Class frmMain
                     CURRENT_JUMP_DOC_GUID = 0
                     CURRENT_DOC_GUID = 0
                     CURRENT_ProfilGUID = CURRENT_CLICKED_PROFILE_ID
-                    LOGGER.Debug($"Item_Scope: hitInfo.InGroupRow...oHitProfilID [{CURRENT_CLICKED_PROFILE_ID}]")
+                    LOGGER.Debug($"Item_Scope: hitInfo.InGroupRow...CURRENT_CLICKED_PROFILE_ID [{CURRENT_CLICKED_PROFILE_ID}]")
                     Load_Profil_from_Grid(CURRENT_CLICKED_PROFILE_ID)
                 ElseIf hitInfo.InDataRow Then
                     LOGGER.Debug($"Item_Scope: hitInfo.InDataRow...")
@@ -2136,6 +2135,19 @@ Public Class frmMain
         Else
             GridViewItem_Clicked = Nothing
         End If
+        If Not IsNothing(CURRENT_CLICKED_PROFILE_ID) Then
+            If IsNumeric(CURRENT_CLICKED_PROFILE_ID) Then
+                If CURRENT_CLICKED_PROFILE_ID > 0 Then
+                    For Each orow As DataRow In CURRENT_DT_PROFILES.Rows
+                        If orow.Item("GUID") = CURRENT_CLICKED_PROFILE_ID Then
+                            CURRENT_CLICKED_PROFILE_TITLE = orow.Item("TITLE")
+                            Exit For
+                        End If
+                    Next
+                End If
+            End If
+        End If
+
     End Sub
 
     Private Sub GridView_Docs_ColumnWidthChanged(sender As Object, e As Views.Base.ColumnEventArgs) Handles GridView_Docs.ColumnWidthChanged