Ensure dtor throws into catch block

Explicitly destruct the GAL context to get StopDrawing throws in the
proper try block

Fixes https://gitlab.com/kicad/code/kicad/issues/12117
This commit is contained in:
Seth Hillbrand 2022-09-29 15:25:20 -07:00
parent c1da59b560
commit 519084546e
1 changed files with 41 additions and 38 deletions

View File

@ -254,6 +254,9 @@ void EDA_DRAW_PANEL_GAL::DoRePaint()
cntUpd.Stop();
// GAL_DRAWING_CONTEXT can throw in the dtor, so we need to scope
// the full lifetime inside the try block
{
cntCtx.Start();
KIGFX::GAL_DRAWING_CONTEXT ctx( m_gal );
cntCtx.Stop();
@ -298,6 +301,10 @@ void EDA_DRAW_PANEL_GAL::DoRePaint()
cntCtxDestroy.Start();
}
// ctx goes out of scope here so destructor would be called
cntCtxDestroy.Stop();
}
catch( std::exception& err )
{
if( GAL_FALLBACK != m_backend )
@ -315,10 +322,6 @@ void EDA_DRAW_PANEL_GAL::DoRePaint()
}
}
// ctx goes out of scope here so destructor would be called
cntCtxDestroy.Stop();
if( isDirty )
{
KI_TRACE( traceGalProfile, "View timing: %s %s %s %s %s\n",