Fix cherry-pick issue with file locking
This commit is contained in:
parent
131013f291
commit
093db600ff
|
@ -1243,7 +1243,7 @@ bool SCH_EDIT_FRAME::importFile( const wxString& aFileName, int aFileType )
|
||||||
msg.Printf( _( "Schematic '%s' is already open by '%s' at '%s'." ), aFileName,
|
msg.Printf( _( "Schematic '%s' is already open by '%s' at '%s'." ), aFileName,
|
||||||
m_file_checker->GetUsername(), m_file_checker->GetHostname() );
|
m_file_checker->GetUsername(), m_file_checker->GetHostname() );
|
||||||
|
|
||||||
if( !OverrideLock( this, msg ) )
|
if( !AskOverrideLock( this, msg ) )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
m_file_checker->OverrideLock();
|
m_file_checker->OverrideLock();
|
||||||
|
|
Loading…
Reference in New Issue