Cherry-pick part of 14f6e32
This brings EDA_DRAW_FRAME::LockFile into compliance with the lockfile.h status code. This was part of a larger commit in the master branch but the return code checking is needed for v7
This commit is contained in:
parent
2f35d97b27
commit
7bcd3e2262
|
@ -230,10 +230,9 @@ bool EDA_DRAW_FRAME::LockFile( const wxString& aFileName )
|
||||||
|
|
||||||
m_file_checker = std::make_unique<LOCKFILE>( aFileName );
|
m_file_checker = std::make_unique<LOCKFILE>( aFileName );
|
||||||
|
|
||||||
// If the file is not valid, or is successfully locked, return true
|
// If the file is valid, return true. This could mean that the file is
|
||||||
// Invalid lockfiles are the result of bad permissions, so this is
|
// locked or it could mean that the file is read-only
|
||||||
// likely not a file that we can override regardless
|
return m_file_checker->Valid();
|
||||||
return !m_file_checker->Valid() || m_file_checker->Locked();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue