diff --git a/DesktopEditor/doctrenderer/app_builder/main.cpp b/DesktopEditor/doctrenderer/app_builder/main.cpp index 28b149d838..c471c9d3d0 100644 --- a/DesktopEditor/doctrenderer/app_builder/main.cpp +++ b/DesktopEditor/doctrenderer/app_builder/main.cpp @@ -150,7 +150,10 @@ int main(int argc, char *argv[]) if (true) { NSDoctRenderer::CDocBuilder oBuilder; + + // если отключена эта опция - то она отключится на parse_args oBuilder.SetProperty("--check-fonts", L""); + //oBuilder.SetProperty("--use-doctrenderer-scheme", L""); //oBuilder.SetProperty("--work-directory", L"builder"); diff --git a/DesktopEditor/doctrenderer/docbuilder_p.cpp b/DesktopEditor/doctrenderer/docbuilder_p.cpp index 379d570dbc..f776dad968 100644 --- a/DesktopEditor/doctrenderer/docbuilder_p.cpp +++ b/DesktopEditor/doctrenderer/docbuilder_p.cpp @@ -668,7 +668,12 @@ namespace NSDoctRenderer if (sParam == "--use-doctrenderer-scheme") m_pInternal->m_oParams.m_bSaveWithDoctrendererMode = true; else if (sParam == "--check-fonts") - m_pInternal->m_oParams.m_bCheckFonts = true; + { + if (value && value[0] == '0') + m_pInternal->m_oParams.m_bCheckFonts = false; + else + m_pInternal->m_oParams.m_bCheckFonts = true; + } else if (sParam == "--work-directory") m_pInternal->m_oParams.m_sWorkDir = std::wstring(value); else if (sParam == "--cache-scripts") diff --git a/DesktopEditor/doctrenderer/docbuilder_p.h b/DesktopEditor/doctrenderer/docbuilder_p.h index d349a64ca2..91e49096a6 100644 --- a/DesktopEditor/doctrenderer/docbuilder_p.h +++ b/DesktopEditor/doctrenderer/docbuilder_p.h @@ -266,6 +266,8 @@ namespace NSDoctRenderer oWorker.m_arAdditionalFolders = m_oParams.m_arFontDirs; oWorker.m_bIsNeedThumbnails = false; oWorker.m_sDirectory = sDirectory; + // это не рабочая папка, где только шрифты + oWorker.m_bIsCleanDirectory = false; NSFonts::IApplicationFonts* pFonts = oWorker.Check(); if(pFonts) pFonts->Release();