← Back to team overview

kicad-developers team mailing list archive

[PATCH] Fix cancel option when exiting without saving

 

In three different programs (pcbnew, cvpcb, and eeschema) if you close
without saving and press cancel in the dialog that comes up you get an
assert from wxWidgets.

This is caused by the dialog being set to forced close which means that it
can't be cancelled. The attached patch fixes this issue.

Jon Neal
diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp
index 23d66e8..d937b57 100644
--- a/cvpcb/cvframe.cpp
+++ b/cvpcb/cvframe.cpp
@@ -235,7 +235,7 @@ void CVPCB_MAINFRAME::OnSize( wxSizeEvent& event )
 
 void CVPCB_MAINFRAME::OnQuit( wxCommandEvent& event )
 {
-    Close( true );
+    Close( false );
 }
 
 
diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp
index 8ac79c2..c675420 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -1134,7 +1134,7 @@ void SCH_EDIT_FRAME::OnRescueProject( wxCommandEvent& event )
 
 void SCH_EDIT_FRAME::OnExit( wxCommandEvent& event )
 {
-    Close( true );
+    Close( false );
 }
 
 
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index fab3ed5..158830c 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -567,7 +567,7 @@ void PCB_EDIT_FRAME::ReFillLayerWidget()
 
 void PCB_EDIT_FRAME::OnQuit( wxCommandEvent& event )
 {
-    Close( true );
+    Close( false );
 }
 
 

Follow ups