From 8b0eb3e4685c843ba217e7493d7698bd1ecc2a6e Mon Sep 17 00:00:00 2001
From: "Ouellette Jonathan (CSC FI SPS MESLEO)"
 <Jonathan.Ouellette@infineon.com>
Date: Tue, 15 Apr 2025 01:38:09 +0200
Subject: [PATCH] Merged PR 15046: Buffered the current QBF position and used
 that buffered value to override th...

Buffered the current QBF position and used that buffered value to override the QBF Next function that is occuring at the system level. Removed unnessecary writing of the window title, and commented out code.

Related work items: #252917
---
 LSL2/STPROC/COMM_RDS.txt |  6 ++++--
 LSL2/STPROC/RDS_COMM.txt | 24 ++----------------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/LSL2/STPROC/COMM_RDS.txt b/LSL2/STPROC/COMM_RDS.txt
index b6f23b8..82b2c58 100644
--- a/LSL2/STPROC/COMM_RDS.txt
+++ b/LSL2/STPROC/COMM_RDS.txt
@@ -2308,7 +2308,6 @@ RETURN
 CIClick:
 * * * * * * *
     
-    
     CurrCtrl = Parm1
     
     BEGIN CASE
@@ -2379,10 +2378,12 @@ CIClick:
     END
     
     IF CINo NE '' THEN
-        
+        CurrQBFPos = Get_Property (@WINDOW, "QBFPOS"); // 4/14/2025 - JRO - CLEAR event below is advancing the QBF position. Buffer the current position before that happens
         Send_Event(@WINDOW,'WRITE')
+        
         Send_Event(@WINDOW,'CLEAR') ; // 12/22/2017 - DMB - Although WRITE normally clears the form, QBF mode will prevent the clear so do this explicitly so the lock is removed from the RDS record.
         
+        Set_Property (@WINDOW, "QBFPOS", CurrQBFPos); // - JRO - 4/14/2025 CLEAR event above is advancing the QBF position. apply the buffered position value
         DetWindow	= 'CLEAN_INSP'
         DetKeys		= CINo
         DefaultRec	= ''
@@ -2951,3 +2952,4 @@ RefreshWaferCounterData:
     
 return
 
+
diff --git a/LSL2/STPROC/RDS_COMM.txt b/LSL2/STPROC/RDS_COMM.txt
index 8a4edd7..8975521 100644
--- a/LSL2/STPROC/RDS_COMM.txt
+++ b/LSL2/STPROC/RDS_COMM.txt
@@ -276,15 +276,8 @@ IF SkipSaveWarn THEN
 	Set_Property(@WINDOW,'@SKIP_SAVEWARN','')
 END
 
-
-*IF Get_Property( @window, 'SAVEWARN' ) THEN
-*	MsgInfo = ''
-*	MsgInfo<mtext$> = 'You must either save this first or clear the form.'
-*	MsgInfo<micon$> = '!'
-*	Void = msg( '', MsgInfo )
-*END ELSE
 	RdsWindowToCall = Get_Property( @window, '@RdsWindowToCall' )
-
+	
 	QbfList = Get_Property( @window, 'QBFLIST' )
 	QbfPos  = Get_Property( @window, 'QBFPOS' )	   
 	IF QbfList THEN
@@ -300,20 +293,6 @@ END
 		   
 	Void = Start_Window( RdsWindowToCall, Parent, QbfList:'*CENTER', '', '' )
 	
-	IF QbfPos THEN
-		Void = Set_Property( RdsWindowToCall, 'QBFPOS', QbfPos )
-		Void = Send_Event( RdsWindowToCall, 'READ' )
-		
-		* The reason we have to fill in the title with the qbf stuff is 
-		* when setting the qbfpos and then calling read it does not show
-		* N of N in the title - OI bug a boo
-		
-		CurTitle = Get_Property( RdsWindowToCall, 'TEXT' )
-		CurTitle:= ' - <QBF Browse: ':QbfPos:' of ':fieldcount( QbfList, @vm ):'>'
-		Void = Set_Property( RdsWindowToCall, 'TEXT', CurTitle )      
-	END
-	
-*END
 RETURN
 
 *============================================================================*
@@ -558,3 +537,4 @@ SET_ML_LIMITS:
 return
 *===============================================================================================*
 
+