From 922bf1ddeaffc6da1d58f0437e23914c7a693d10 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Wed, 14 May 2014 12:08:29 +0200
Subject: [PATCH] Fixed freezing of GAL canvas if user chooses Cancel in the on
 close dialog.

---
 pcbnew/pcbframe.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index 212dd6a83c..9695d39bb6 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -591,7 +591,6 @@ void PCB_EDIT_FRAME::OnQuit( wxCommandEvent& event )
 void PCB_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event )
 {
     m_canvas->SetAbortRequest( true );
-    GetGalCanvas()->StopDrawing();
 
     if( GetScreen()->IsModify() )
     {
@@ -615,6 +614,8 @@ void PCB_EDIT_FRAME::OnCloseWindow( wxCloseEvent& Event )
         }
     }
 
+    GetGalCanvas()->StopDrawing();
+
     // Delete the auto save file if it exists.
     wxFileName fn = GetBoard()->GetFileName();