From fe1128f2bc7a9911ee533bffc082b4012687b0be Mon Sep 17 00:00:00 2001 From: wp Date: Mon, 12 Jun 2017 21:58:15 +0000 Subject: [PATCH] tools/jsonviewer: Fix crashing due to unknown clipboard format git-svn-id: trunk@55340 - --- tools/jsonviewer/frmmain.pp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/jsonviewer/frmmain.pp b/tools/jsonviewer/frmmain.pp index 161d01bfb5..3bcfc960b7 100644 --- a/tools/jsonviewer/frmmain.pp +++ b/tools/jsonviewer/frmmain.pp @@ -211,7 +211,8 @@ var implementation -uses typinfo,msgjsonviewer, frmNewBoolean, frmNewINteger, frmNewString, clipbrd; +uses + typinfo,msgjsonviewer, lcltype, frmNewBoolean, frmNewINteger, frmNewString, clipbrd; {$R *.lfm} Const @@ -628,12 +629,13 @@ begin D.Free; Exit; end; - AddDataToCOntainer(N,D); + AddDataToContainer(N,D); end; procedure TMainForm.APasteUpdate(Sender: TObject); begin - (Sender as TAction).Enabled:=ClipBoard.HasFormat(Clipboard.FindFormatID('text/plain')); +// (Sender as TAction).Enabled:=ClipBoard.HasFormat(Clipboard.FindFormatID('text/plain')); + (Sender as TAction).Enabled:=ClipBoard.HasFormat(CF_TEXT); end; procedure TMainForm.AddNewValue(AType : TJSONType);