Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
1bcfd956
Commit
1bcfd956
authored
Jan 07, 2015
by
Adam Wolf
Committed by
Wayne Stambaugh
Jan 07, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix KiCad project file missing error meassage on first run and missing history file.
parent
c9a1b239
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
kicad.cpp
kicad/kicad.cpp
+9
-2
prjconfig.cpp
kicad/prjconfig.cpp
+3
-3
No files found.
kicad/kicad.cpp
View file @
1bcfd956
...
...
@@ -6,8 +6,8 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2004-201
2
Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2004-201
2
KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 2004-201
5
Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2004-201
5
KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
@@ -173,6 +173,13 @@ bool PGM_KICAD::OnPgmInit( wxApp* aWxApp )
prjloaded
=
true
;
// OnFileHistory() loads the project
}
}
else
// there is no history
{
wxFileName
namelessProject
(
wxGetCwd
(),
NAMELESS_PROJECT
,
ProjectFileExtension
);
frame
->
SetProjectFileName
(
namelessProject
.
GetFullPath
()
);
}
if
(
!
prjloaded
)
{
...
...
kicad/prjconfig.cpp
View file @
1bcfd956
...
...
@@ -6,8 +6,8 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2004-201
2
Jean-Pierre Charras
* Copyright (C) 2004-201
2
KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 2004-201
5
Jean-Pierre Charras
* Copyright (C) 2004-201
5
KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
@@ -259,7 +259,7 @@ void KICAD_MANAGER_FRAME::OnLoadProject( wxCommandEvent& event )
wxString
nameless_prj
=
NAMELESS_PROJECT
wxT
(
".pro"
);
// Check if project file exists and if it is not noname.pro
if
(
!
wxFileExists
(
prj_filename
)
&&
!
prj_filename
.
IsSameAs
(
nameless_prj
)
)
if
(
!
wxFileExists
(
prj_filename
)
&&
!
wxFileName
(
prj_filename
).
GetFullName
()
.
IsSameAs
(
nameless_prj
)
)
{
wxString
msg
=
wxString
::
Format
(
_
(
"KiCad project file '%s' not found"
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment