Index: AAPClient/ProScanMain.pas =================================================================== diff -u -r72 -r73 --- AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 72) +++ AAPClient/ProScanMain.pas (.../ProScanMain.pas) (revision 73) @@ -73,10 +73,10 @@ //LoginScherm tonen if fHuidigScherm.ClassType = TfmLoginScherm then begin - if fHuidigScherm.ModalResult = mrRetry then begin + if fHuidigScherm.ModalResult = mrLogin then begin fHuidigScherm := fLoginScherm; end - else if fHuidigScherm.ModalResult = mrOk then begin + else if fHuidigScherm.ModalResult = mrHome then begin fHuidigScherm := fHomeScherm; end; continue; Index: AAPClient/UI/LoginScherm.pas =================================================================== diff -u -r67 -r73 --- AAPClient/UI/LoginScherm.pas (.../LoginScherm.pas) (revision 67) +++ AAPClient/UI/LoginScherm.pas (.../LoginScherm.pas) (revision 73) @@ -33,7 +33,7 @@ implementation uses - GebruikerService; + GebruikerService, UiContext; {$R *.dfm} @@ -86,12 +86,12 @@ Response := Service.GebruikerAanmelden(Request); try if Response.Header.Status <> '200' then begin - Self.ModalResult := mrRetry; + Self.ModalResult := mrLogin; ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw') end else begin lblGebruiker.Caption := UiContext.Initialen; lblGebruiker.Visible := true; - Self.ModalResult := mrOk; + Self.ModalResult := mrHome; end; finally Response.Free; Index: AAPClient/UI/UiContext.pas =================================================================== diff -u -r69 -r73 --- AAPClient/UI/UiContext.pas (.../UiContext.pas) (revision 69) +++ AAPClient/UI/UiContext.pas (.../UiContext.pas) (revision 73) @@ -2,6 +2,10 @@ interface +const + mrLogin = 101; + mrHome = 102; + type TUiContext = class private