Updated Branches: refs/heads/release4.10.0 58d45a1c0 -> d6b940f79
FLEX-33142 stop RTE when using Halo theme and modules Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/d6b940f7 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/d6b940f7 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/d6b940f7 Branch: refs/heads/release4.10.0 Commit: d6b940f7977d67850f2be3551607e6076a0bf07c Parents: 58d45a1 Author: Justin Mclean <jmcl...@apache.org> Authored: Wed Jul 17 15:25:15 2013 +1000 Committer: Justin Mclean <jmcl...@apache.org> Committed: Wed Jul 17 15:25:15 2013 +1000 ---------------------------------------------------------------------- frameworks/projects/spark/src/spark/utils/FTETextUtil.as | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/d6b940f7/frameworks/projects/spark/src/spark/utils/FTETextUtil.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/spark/src/spark/utils/FTETextUtil.as b/frameworks/projects/spark/src/spark/utils/FTETextUtil.as index 2f0bc87..00a50b8 100644 --- a/frameworks/projects/spark/src/spark/utils/FTETextUtil.as +++ b/frameworks/projects/spark/src/spark/utils/FTETextUtil.as @@ -211,8 +211,9 @@ public class FTETextUtil localLookup = IUIComponent(uic.parent).systemManager; } - fontContext = embeddedFontRegistry.getAssociatedModuleFactory( - font, bold, italic, client, moduleFactory, localLookup, true); + if (embeddedFontRegistry) + fontContext = embeddedFontRegistry.getAssociatedModuleFactory( + font, bold, italic, client, moduleFactory, localLookup, true); } if (!fontContext && fontLookup == FontLookup.EMBEDDED_CFF)