From 79ca80e8f2b8c119b6e7a77d8d685fcbf821dafb Mon Sep 17 00:00:00 2001
From: The MMGen Project <mmgen@tuta.io>
Date: Fri, 8 May 2026 13:34:30 +0000
Subject: [PATCH] autosign: re-enable file cleaning for non-XMR setup (bugfix)

---
 mmgen/autosign/__init__.py | 30 ++++++++++++------------------
 mmgen/data/version         |  2 +-
 mmgen/main_autosign.py     |  3 +++
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/mmgen/autosign/__init__.py b/mmgen/autosign/__init__.py
index b0d74f39..c69154fd 100755
--- a/mmgen/autosign/__init__.py
+++ b/mmgen/autosign/__init__.py
@@ -442,24 +442,18 @@ class Autosign:
 		return self._xmrwallet_cfg
 
 	def xmr_setup(self):
-
-		def create_signing_wallets():
-			from .. import xmrwallet
-			if len(self.wallet_files) > 1:
-				ymsg(
-					'Warning: more than one wallet file, using the first '
-					f'({self.wallet_files[0]}) for xmrwallet generation')
-			m = xmrwallet.op(
-				'create_offline',
-				self.xmrwallet_cfg,
-				infile  = str(self.wallet_files[0]), # MMGen wallet file
-				wallets = self.cfg.xmrwallets)       # XMR wallet idxs
-			asyncio.run(m.main())
-			asyncio.run(m.stop_wallet_daemon())
-
-		self.clean_old_files()
-
-		create_signing_wallets()
+		from .. import xmrwallet
+		if len(self.wallet_files) > 1:
+			ymsg(
+				'Warning: more than one wallet file, using the first '
+				f'({self.wallet_files[0]}) for xmrwallet generation')
+		m = xmrwallet.op(
+			'create_offline',
+			self.xmrwallet_cfg,
+			infile  = str(self.wallet_files[0]), # MMGen wallet file
+			wallets = self.cfg.xmrwallets)       # XMR wallet idxs
+		asyncio.run(m.main())
+		asyncio.run(m.stop_wallet_daemon())
 
 	def clean_old_files(self):
 
diff --git a/mmgen/data/version b/mmgen/data/version
index eb197c3c..b5272c1b 100644
--- a/mmgen/data/version
+++ b/mmgen/data/version
@@ -1 +1 @@
-16.1.dev38
+16.1.dev39
diff --git a/mmgen/main_autosign.py b/mmgen/main_autosign.py
index 21d2f1ae..11e88b4a 100755
--- a/mmgen/main_autosign.py
+++ b/mmgen/main_autosign.py
@@ -152,6 +152,8 @@ match cmd:
 	case 'gen_key':
 		asi.gen_key()
 	case 'setup':
+		asi.do_mount()
+		asi.clean_old_files()
 		asi.setup()
 		from .ui import keypress_confirm
 		if cfg.xmrwallets and keypress_confirm(cfg, '\nContinue with Monero setup?', default_yes=True):
@@ -162,6 +164,7 @@ match cmd:
 		if not cfg.xmrwallets:
 			die(1, 'Please specify a wallet or range of wallets with the --xmrwallets option')
 		asi.do_mount()
+		asi.clean_old_files()
 		asi.xmr_setup()
 		asi.do_umount()
 	case 'macos_ramdisk_setup' | 'macos_ramdisk_delete':