Changeset 460 for cprs/branches/foia-cprs/CPRS-Chart/Orders/fOMSet.pas

Timestamp:

Jul 6, 2008, 8:20:14 PM (16 years ago)

Author:

Kevin Toppenberg

Message:

Uploading from OR_30_258

File:

• cprs/branches/foia-cprs/CPRS-Chart/Orders/fOMSet.pas (modified) (9 diffs)

cprs/branches/foia-cprs/CPRS-Chart/Orders/fOMSet.pas

@@ -26 +26 @@
     procedure FormCreate(Sender: TObject);
   private
+    DoingNextItem : Boolean;
+    CloseRequested : Boolean;
     FDelayEvent: TOrderDelayEvent;
     FClosing: Boolean;
@@ -105 +107 @@
 var
   SetItem: TSetItem;
+  theOwner: TComponent;
 
   procedure SkipToNext;
@@ -113 +116 @@
 
 begin
+  DoingNextItem := true;
   //frmFrame.UpdatePtInfoOnRefresh;
   if FClosing then Exit;
@@ -158 +162 @@
                     SkipToNext;
                 end;
-    'O':      if not ActivateOrderSet(  IntToStr(SetItem.DialogIEN), FDelayEvent, Self, ItemIndex) then
-              begin
-                if IsCreatedByMenu(SetItem) and (lstSet.ItemIndex < lstSet.Items.Count - 1) then
-                  lstSet.Checked[lstSet.ItemIndex] := True
-                else SkipToNext;
+    'O':      begin
+                if (Self.Owner.Name = 'frmOMNavA') then theOwner := Self.Owner else theOwner := self;
+                if not ActivateOrderSet( IntToStr(SetItem.DialogIEN), FDelayEvent, theOwner, ItemIndex) then
+                begin
+                  if IsCreatedByMenu(SetItem) and (lstSet.ItemIndex < lstSet.Items.Count - 1) then
+                    lstSet.Checked[lstSet.ItemIndex] := True
+                  else SkipToNext;
+                end;
               end;
     else      begin
@@ -170 +177 @@
     end; {case}
   end; {with lstSet}
+  DoingNextItem := false;
 end;
 
@@ -178 +186 @@
   if Message.WParam = lstSet.ItemIndex then
     if lstSet.ItemIndex < lstSet.Items.Count - 1 then DoNextItem else Close;
+  if CloseRequested then
+    Close;
 end;
 
@@ -197 +207 @@
     begin
       SendMessage(TWinControl(SetItem.OwnedBy).Handle, UM_DESTROY, SetItem.RefNum, 0);
-      Exit;
+      //Exit;
     end;
   end;
@@ -219 +229 @@
   FClosebyDeaCheck := False;
   NoFresh := True;
+  CloseRequested := false;
+  DoingNextItem := false;
 end;
 
@@ -264 +276 @@
 procedure TfrmOMSet.cmdInteruptClick(Sender: TObject);
 begin
-  Close;
+  if DoingNextItem then
+    CloseRequested := true              //Fix for CQ: 8297
+  else
+    Close;
 end;