From 43194dff725e0a422d2399bf199841327a424a18 Mon Sep 17 00:00:00 2001
From: Mike Williams <mike@mikebwilliams.com>
Date: Thu, 26 Aug 2021 11:24:52 -0400
Subject: [PATCH] Pcbnew: don't fallback to software rendering after changing
 footprint

Fixes https://gitlab.com/kicad/code/kicad/-/issues/8915
---
 pcbnew/pcb_edit_frame.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 8e7f30b0bb..16334c8acc 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -1544,11 +1544,21 @@ void PCB_EDIT_FRAME::ShowFootprintPropertiesDialog( FOOTPRINT* aFootprint )
     if( aFootprint == nullptr )
         return;
 
-    DIALOG_FOOTPRINT_PROPERTIES dlg( this, aFootprint );
+    DIALOG_FOOTPRINT_PROPERTIES::FP_PROPS_RETVALUE retvalue;
+
+    /*
+     * Make sure dlg is destroyed before GetCanvas->Refresh is called
+     * later or the refresh will try to modify its properties since
+     * they share a GL context.
+     */
+    {
+        DIALOG_FOOTPRINT_PROPERTIES dlg( this, aFootprint );
+
+        // We use quasi modal to allow displaying help dialogs.
+        dlg.ShowQuasiModal();
+        retvalue = dlg.GetReturnValue();
+    }
 
-    // We use quasi modal to allow displaying help dialogs.
-    dlg.ShowQuasiModal();
-    DIALOG_FOOTPRINT_PROPERTIES::FP_PROPS_RETVALUE retvalue = dlg.GetReturnValue();
     /*
      * retvalue =
      *   FP_PROPS_UPDATE_FP to show Update Footprints dialog