Index: AAPClient/UI/DnaCodeReedsGescandScherm.pas =================================================================== diff -u -r241 -r242 --- AAPClient/UI/DnaCodeReedsGescandScherm.pas (.../DnaCodeReedsGescandScherm.pas) (revision 241) +++ AAPClient/UI/DnaCodeReedsGescandScherm.pas (.../DnaCodeReedsGescandScherm.pas) (revision 242) @@ -42,6 +42,7 @@ procedure TfmDnaCodeReedsGescandScherm.btnTerugClick(Sender: TObject); begin inherited; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; @@ -102,8 +103,10 @@ finally Response.Free; end; - if Self.ModalResult = mrDnaCode then + if Self.ModalResult = mrDnaCode then begin + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); + end; end; procedure TfmDnaCodeReedsGescandScherm.Wegnemen; @@ -118,6 +121,7 @@ finally Response.Free; end; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; Index: AAPClient/UI/HernoemPalletScherm.pas =================================================================== diff -u -r241 -r242 --- AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 241) +++ AAPClient/UI/HernoemPalletScherm.pas (.../HernoemPalletScherm.pas) (revision 242) @@ -62,6 +62,7 @@ procedure TfmHernoemPalletScherm.actHomeExecute(Sender: TObject); begin inherited; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome); end; @@ -170,8 +171,10 @@ result := Response; Response.Free; end; - if Self.ModalResult = mrHome then + if Self.ModalResult = mrHome then begin + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome); + end; end; procedure TfmHernoemPalletScherm.FormShow(Sender: TObject); Index: AAPClient/UI/InfoLogScherm.pas =================================================================== diff -u -r241 -r242 --- AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 241) +++ AAPClient/UI/InfoLogScherm.pas (.../InfoLogScherm.pas) (revision 242) @@ -63,6 +63,7 @@ procedure TfmInfoLogScherm.actTerugExecute(Sender: TObject); begin inherited; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; @@ -86,6 +87,7 @@ Response.Free; end; end; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; Index: AAPClient/UI/BestaandePalletScherm.pas =================================================================== diff -u -r241 -r242 --- AAPClient/UI/BestaandePalletScherm.pas (.../BestaandePalletScherm.pas) (revision 241) +++ AAPClient/UI/BestaandePalletScherm.pas (.../BestaandePalletScherm.pas) (revision 242) @@ -39,12 +39,14 @@ begin inherited; UiContext.Toelevering := ''; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; procedure TfmBestaandePalletScherm.btnHuidigeToeleveringClick(Sender: TObject); begin inherited; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; @@ -57,12 +59,14 @@ UiContext.Toelevering := ''; end; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; procedure TfmBestaandePalletScherm.btnTerugClick(Sender: TObject); begin inherited; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrPallet); end; Index: AAPClient/UI/HomeScherm.pas =================================================================== diff -u -r241 -r242 --- AAPClient/UI/HomeScherm.pas (.../HomeScherm.pas) (revision 241) +++ AAPClient/UI/HomeScherm.pas (.../HomeScherm.pas) (revision 242) @@ -35,24 +35,28 @@ procedure TfmHomeScherm.actAfsluitenExecute(Sender: TObject); begin inherited; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrLogin); end; procedure TfmHomeScherm.btnAfmeldenProductenClick(Sender: TObject); begin inherited; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrPallet); end; procedure TfmHomeScherm.btnHernoemPalletClick(Sender: TObject); begin inherited; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHernoemPallet); end; procedure TfmHomeScherm.btnUitloggenClick(Sender: TObject); begin inherited; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrLogin); end; Index: AAPClient/UI/PalletScherm.pas =================================================================== diff -u -r241 -r242 --- AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 241) +++ AAPClient/UI/PalletScherm.pas (.../PalletScherm.pas) (revision 242) @@ -39,6 +39,7 @@ procedure TfmPalletScherm.actHomeExecute(Sender: TObject); begin inherited; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome); end; @@ -83,6 +84,7 @@ end else begin Self.ModalResult := mrPallet; end; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; Index: AAPClient/UI/DnaCodeScherm.pas =================================================================== diff -u -r241 -r242 --- AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 241) +++ AAPClient/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 242) @@ -58,6 +58,7 @@ procedure TfmDnaCodeScherm.actHomeExecute(Sender: TObject); begin inherited; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrHome); end; @@ -82,6 +83,7 @@ Self.ModalResult := mrDnaCode; end; end; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; @@ -131,6 +133,7 @@ UiContext.InfoLogSchermToonGescand := true; Self.ModalResult := mrInfoLog; end; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; @@ -156,6 +159,7 @@ end; end; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; @@ -238,6 +242,7 @@ finally Response.Free; end; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; @@ -258,6 +263,7 @@ finally Response.Free; end; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end; @@ -345,6 +351,7 @@ finally Response.Free; end; + PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end;