From f77b1b73f43fb9fd3a8f1a7fb1749abd49679bda Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Mon, 26 Oct 2026 13:36:48 +0000
Subject: [PATCH] MSWin fixes

---
 mmgen/daemon.py           | 3 +--
 mmgen/proto/xmr/daemon.py | 3 +--
 test/cmdtest.py           | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/mmgen/daemon.py b/mmgen/daemon.py
index 60b36555..e91134dc 100644
--- a/mmgen/daemon.py
+++ b/mmgen/daemon.py
@@ -436,8 +436,7 @@ class CoinDaemon(Daemon):
 
 		fn_stem = f'{self.id}-{self.network}-daemon-{self.bind_port}'
 		self.logfile = self.network_datadir / (fn_stem + '.log')
-		if self.use_pidfile:
-			self.pidfile = self.network_datadir / (fn_stem + '.pid')
+		self.pidfile = self.network_datadir / (fn_stem + '.pid')
 
 		self.init_subclass()
 
diff --git a/mmgen/proto/xmr/daemon.py b/mmgen/proto/xmr/daemon.py
index 63191c30..74e457a9 100644
--- a/mmgen/proto/xmr/daemon.py
+++ b/mmgen/proto/xmr/daemon.py
@@ -116,8 +116,7 @@ class MoneroWalletDaemon(RPCDaemon):
 			self.wallet_dir = MoneroTwCtl.get_tw_dir(self.proto)
 
 		fn_stem = f'{self.exec_fn}-{self.bind_port}'
-		if self.use_pidfile:
-			self.pidfile = self.proto.network_datadir / (fn_stem + '.pid')
+		self.pidfile = self.proto.network_datadir / (fn_stem + '.pid')
 		self.logfile = self.proto.network_datadir / (fn_stem + '.log')
 
 		self.proxy = proxy
diff --git a/test/cmdtest.py b/test/cmdtest.py
index eee5b4ac..a48cf118 100755
--- a/test/cmdtest.py
+++ b/test/cmdtest.py
@@ -195,7 +195,7 @@ if not po.user_opts.get('skip_deps'):
 	for fn in (data_dir, autosign_data_dir):
 		try:
 			os.unlink(fn)
-		except IsADirectoryError:
+		except (IsADirectoryError, PermissionError):
 			import shutil
 			shutil.rmtree(fn)
 		except FileNotFoundError: