From c7758999afd89f2bef0ff066b7959365d58a482d Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <seth@kipro-pcb.com>
Date: Wed, 31 May 2023 17:04:32 -0700
Subject: [PATCH] Handle LOCKFILE logistics for ro

We need to check if a lockfile is valid to determine if we should
override the lock. Valid() is true if the lockfile couldn't be created
b/c of permissions or if the lockfile could be created and acquired.
---
 common/settings/settings_manager.cpp | 2 +-
 pcbnew/files.cpp                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/settings/settings_manager.cpp b/common/settings/settings_manager.cpp
index 389a4ab28f..f1359aeb3e 100644
--- a/common/settings/settings_manager.cpp
+++ b/common/settings/settings_manager.cpp
@@ -894,7 +894,7 @@ bool SETTINGS_MANAGER::LoadProject( const wxString& aFullPath, bool aSetActive )
     bool readOnly = false;
     LOCKFILE lockFile( fullPath );
 
-    if( !lockFile )
+    if( !lockFile.Valid() )
     {
         wxLogTrace( traceSettings, wxT( "Project %s is locked; opening read-only" ), fullPath );
         readOnly = true;
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index 9bdf02c7d9..a6098c9503 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -607,7 +607,7 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
 
     std::unique_ptr<LOCKFILE> lock = std::make_unique<LOCKFILE>( fullFileName );
 
-    if( !lock->Locked() )
+    if( !lock->Valid() )
     {
         msg.Printf( _( "PCB '%s' is already open by '%s' at '%s'." ), wx_filename.GetFullName(),
                 lock->GetUsername(), lock->GetHostname() );