Skip to content

Commit 4e5495b

Browse files
committed
ccrystaltextview.cpp: Fix crash at preview when the printer is not installed. (I discovered this when I ran WinMerge on Wine.)
1 parent 4adc8cd commit 4e5495b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Externals/crystaledit/editlib/ccrystaltextview.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,7 @@ CCrystalTextView::CCrystalTextView ()
596596
, m_bIncrementalFound(false)
597597
, m_rxmatch{}
598598
, m_nRenderingMode(s_nRenderingModeDefault)
599+
, m_pCrystalRendererSaved(nullptr)
599600
{
600601
#ifdef _WIN64
601602
if (m_nRenderingMode == RENDERING_MODE_GDI)
@@ -3004,8 +3005,11 @@ OnBeginPrinting (CDC * pdc, CPrintInfo * pInfo)
30043005
void CCrystalTextView::
30053006
OnEndPrinting (CDC * pdc, CPrintInfo * pInfo)
30063007
{
3007-
m_pCrystalRenderer.reset(m_pCrystalRendererSaved);
3008-
3008+
if (m_pCrystalRendererSaved)
3009+
{
3010+
m_pCrystalRenderer.reset(m_pCrystalRendererSaved);
3011+
m_pCrystalRendererSaved = nullptr;
3012+
}
30093013
if (m_pPrintFont != nullptr)
30103014
{
30113015
delete m_pPrintFont;

0 commit comments

Comments
 (0)