haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deconflict instance-checker dir with 7.0

This commit is contained in:
Jon Evans 2024-02-07 18:35:10 -05:00
parent 9d57637a1a
commit 4622738c93
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/paths.cpp
View File

@ -389,7 +389,7 @@ wxString PATHS::GetInstanceCheckerPath()
{ {
wxFileName path; wxFileName path;
path.AssignDir( wxStandardPaths::Get().GetTempDir() ); path.AssignDir( wxStandardPaths::Get().GetTempDir() );
path.AppendDir( "kicad" ); path.AppendDir( "org.kicad.kicad" );
path.AppendDir( "instances" ); path.AppendDir( "instances" );
return path.GetPathWithSep(); return path.GetPathWithSep();
} }

6
common/pgm_base.cpp
View File

@ -45,6 +45,7 @@
#include <advanced_config.h> #include <advanced_config.h>
#include <background_jobs_monitor.h> #include <background_jobs_monitor.h>
#include <bitmaps.h> #include <bitmaps.h>
#include <build_version.h>
#include <common.h> #include <common.h>
#include <confirm.h> #include <confirm.h>
#include <core/arraydim.h> #include <core/arraydim.h>
@ -493,8 +494,11 @@ bool PGM_BASE::InitPgm( bool aHeadless, bool aSkipPyInit, bool aIsUnitTest )
wxString instanceCheckerDir = PATHS::GetInstanceCheckerPath(); wxString instanceCheckerDir = PATHS::GetInstanceCheckerPath();
PATHS::EnsurePathExists( instanceCheckerDir ); PATHS::EnsurePathExists( instanceCheckerDir );
wxString instanceCheckerName = wxString::Format( wxS( "%s-%s" ), pgm_name,
GetMajorMinorVersion() );
m_pgm_checker = std::make_unique<wxSingleInstanceChecker>(); m_pgm_checker = std::make_unique<wxSingleInstanceChecker>();
m_pgm_checker->Create( pgm_name, instanceCheckerDir ); m_pgm_checker->Create( instanceCheckerName, instanceCheckerDir );
// Init KiCad environment // Init KiCad environment
// the environment variable KICAD (if exists) gives the kicad path: // the environment variable KICAD (if exists) gives the kicad path: