From 3e398ce1c6e5426f9a238467e0f5e024545ee28b Mon Sep 17 00:00:00 2001
From: Jon Neal <reportingsjr@gmail.com>
Date: Thu, 25 Jun 2015 15:06:51 -0400
Subject: [PATCH] Fix assertion in CvPcb, Eeschema, and Pcbnew when cancel is
 selected from save on exit dialog.

---
 cvpcb/cvframe.cpp     | 2 +-
 eeschema/schframe.cpp | 6 ++++--
 pcbnew/pcbframe.cpp   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp
index 23d66e81f0..d937b5758d 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 8ac79c2dd3..4b3ea2bfcc 100644
--- a/eeschema/schframe.cpp
+++ b/eeschema/schframe.cpp
@@ -1127,14 +1127,16 @@ void SCH_EDIT_FRAME::OnOpenLibraryEditor( wxCommandEvent& event )
     }
 }
 
+
 void SCH_EDIT_FRAME::OnRescueProject( wxCommandEvent& event )
 {
     RescueProject( true );
 }
 
+
 void SCH_EDIT_FRAME::OnExit( wxCommandEvent& event )
 {
-    Close( true );
+    Close( false );
 }
 
 
@@ -1266,7 +1268,7 @@ void SCH_EDIT_FRAME::addCurrentItemToList( wxDC* aDC )
                 ( (SCH_SHEET*)undoItem )->AddPin( (SCH_SHEET_PIN*) item );
             else
                 wxLogMessage( wxT( "addCurrentItemToList: expected type = SCH_SHEET_PIN_T, actual type = %d" ),
-                            item->Type() );
+                              item->Type() );
         }
     }
     else
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index fab3ed5308..158830c764 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 );
 }