gh-920: Initialization issue with inaccessible paths

alabuzhev · alabuzhev · commit 739e550d38ec · 2025-05-05T17:06:35.000+01:00
diff --git a/far/filesystemwatcher.cpp b/far/filesystemwatcher.cpp
@@ -221,7 +221,8 @@ FileSystemWatcher::FileSystemWatcher(const string_view EventId, const string_vie
 
 FileSystemWatcher::~FileSystemWatcher()
 {
-	background_watcher::instance().remove(this);
+	if (m_Overlapped.hEvent)
+		background_watcher::instance().remove(this);
 
 	{
 		SCOPED_ACTION(std::scoped_lock)(m_CS);

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,8 @@ FileSystemWatcher::FileSystemWatcher(const string_view EventId, const string_vie`
`221`	`221`
`222`	`222`	`FileSystemWatcher::~FileSystemWatcher()`
`223`	`223`	`{`
`224`		`- background_watcher::instance().remove(this);`
	`224`	`+ if (m_Overlapped.hEvent)`
	`225`	`+ background_watcher::instance().remove(this);`
`225`	`226`
`226`	`227`	`{`
`227`	`228`	`SCOPED_ACTION(std::scoped_lock)(m_CS);`