Bail on single instance checker.

We lock the project file, board, and schematic now, so the second copy
can only open them read-only.  While issues might remain, it's unclear
the warning ever prevented anyone from shooting themselves in the foot
anyway.

Fixes https://gitlab.com/kicad/code/kicad/issues/7465
This commit is contained in:
Jeff Young 2021-06-20 21:34:49 +01:00
parent 3d7e18561d
commit 99da3d1336
2 changed files with 0 additions and 34 deletions

View File

@ -102,7 +102,6 @@ LANGUAGE_DESCR LanguagesList[] =
PGM_BASE::PGM_BASE()
{
m_pgm_checker = nullptr;
m_locale = nullptr;
m_Printing = false;
m_ModalDialogCount = 0;
@ -124,9 +123,6 @@ PGM_BASE::~PGM_BASE()
void PGM_BASE::Destroy()
{
// unlike a normal destructor, this is designed to be called more than once safely:
delete m_pgm_checker;
m_pgm_checker = nullptr;
delete m_locale;
m_locale = nullptr;
}
@ -219,33 +215,6 @@ bool PGM_BASE::InitPgm( bool aHeadless )
}
#endif
m_pgm_checker = new wxSingleInstanceChecker( pgm_name + wxT( "-" ) +
wxGetUserId(), GetKicadLockFilePath() );
// It'd be nice to export this processing to the individual apps, but the current linkage
// makes that surprisingly difficult.
if( m_pgm_checker->IsAnotherRunning() )
{
if( pgm_name == "pcb_calculator"
|| pgm_name == "gerbview"
|| pgm_name == "bitmap2component" )
{
// no warning
}
else
{
if( !IsOK( NULL, wxString::Format( _( "%s is already running. Continue?\n\n"
"Saving files from more than one %s instance may "
"cause the project file to get out of sync." ),
App().GetAppDisplayName(),
App().GetAppDisplayName() ) ) )
{
return false;
}
}
}
// Init KiCad environment
// the environment variable KICAD (if exists) gives the kicad path:
// something like set KICAD=d:\kicad

View File

@ -308,9 +308,6 @@ protected:
std::unique_ptr<SCRIPTING> m_python_scripting;
/// prevents multiple instances of a program from being run at the same time.
wxSingleInstanceChecker* m_pgm_checker;
/// full path to this program
wxString m_bin_dir;