Eeschema: fix Bug #1463158 (When a schematic hierarchy is being edited, Eeschema saves sub-sheets in the new project, when the user open a new project, and save the current editon).
This was due to the fact the project name was changed before the user was prompted to save the design. A very minor other fix.
This commit is contained in:
parent
d583b1ff98
commit
5d2500d7db
|
@ -69,11 +69,6 @@ SCH_MARKER::SCH_MARKER( const wxPoint& pos, const wxString& text ) :
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
SCH_MARKER::~SCH_MARKER()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
EDA_ITEM* SCH_MARKER::Clone() const
|
EDA_ITEM* SCH_MARKER::Clone() const
|
||||||
{
|
{
|
||||||
return new SCH_MARKER( *this );
|
return new SCH_MARKER( *this );
|
||||||
|
|
|
@ -60,8 +60,6 @@ public:
|
||||||
|
|
||||||
// Do not create a copy constructor. The one generated by the compiler is adequate.
|
// Do not create a copy constructor. The one generated by the compiler is adequate.
|
||||||
|
|
||||||
~SCH_MARKER();
|
|
||||||
|
|
||||||
wxString GetClass() const
|
wxString GetClass() const
|
||||||
{
|
{
|
||||||
return wxT( "SCH_MARKER" );
|
return wxT( "SCH_MARKER" );
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
|
|
||||||
#include <fctsys.h>
|
#include <fctsys.h>
|
||||||
#include <pgm_kicad.h>
|
#include <pgm_kicad.h>
|
||||||
|
#include <kiway.h>
|
||||||
#include <wx/fs_zip.h>
|
#include <wx/fs_zip.h>
|
||||||
#include <wx/zipstrm.h>
|
#include <wx/zipstrm.h>
|
||||||
#include <wx/docview.h>
|
#include <wx/docview.h>
|
||||||
|
@ -52,9 +53,17 @@ void KICAD_MANAGER_FRAME::OnFileHistory( wxCommandEvent& event )
|
||||||
|
|
||||||
if( fn.size() )
|
if( fn.size() )
|
||||||
{
|
{
|
||||||
wxCommandEvent cmd( 0, wxID_ANY );
|
// Any open KIFACE's must be closed before changing the project.
|
||||||
|
// We never want a KIWAY_PLAYER open on a KIWAY that isn't in the same project,
|
||||||
|
// and then break one project.
|
||||||
|
// Remember when saving files, the full path is build from the current project path
|
||||||
|
// User is prompted here to close those KIWAY_PLAYERs:
|
||||||
|
if( !Kiway.PlayersClose( false ) )
|
||||||
|
return;
|
||||||
|
|
||||||
|
// We can now set the new project filename and load this project
|
||||||
SetProjectFileName( fn );
|
SetProjectFileName( fn );
|
||||||
|
wxCommandEvent cmd( 0, wxID_ANY );
|
||||||
OnLoadProject( cmd );
|
OnLoadProject( cmd );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue