From 9cca5e1b12f53f1eee7a47edd57076fada8bcf46 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Mon, 24 Aug 2015 14:48:36 +0200 Subject: [PATCH] fix, TCECustimWritableComponent, prop hasLoaded could be erroneously set to true --- src/ce_writablecomponent.pas | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/ce_writablecomponent.pas b/src/ce_writablecomponent.pas index 58f84c63..aaed9a59 100644 --- a/src/ce_writablecomponent.pas +++ b/src/ce_writablecomponent.pas @@ -107,11 +107,21 @@ begin end; procedure TCustomWritableComponent.loadFromFile(const aFilename: string); +var + err: boolean; begin - fHasLoaded := true; + err := false; + fHasLoaded := false; beforeLoad; setFilename(aFilename); - customLoadFromFile(aFilename); + try + customLoadFromFile(aFilename); + except + err := true; + fHasLoaded := false; + end; + if not err then + fHasLoaded := true; afterLoad; end; {$ENDREGION}