From 8c8dd37ce07e9b63ed0002821b74e86dccd56e64 Mon Sep 17 00:00:00 2001 From: YoursFunny Date: Mon, 6 Jul 2026 11:03:35 +0800 Subject: [PATCH] fix: handle MuMu12 v4.0.4 default instance serial and improve instance naming --- module/device/platform/emulator_windows.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/module/device/platform/emulator_windows.py b/module/device/platform/emulator_windows.py index 021203a..4095ba9 100644 --- a/module/device/platform/emulator_windows.py +++ b/module/device/platform/emulator_windows.py @@ -299,12 +299,23 @@ class Emulator(EmulatorBase): for folder in self.list_folder('../vms', is_dir=True): for file in iter_folder(folder, ext='.nemu'): serial = Emulator.vbox_file_to_serial(file) + name = os.path.basename(folder) if serial: yield EmulatorInstance( serial=serial, - name=os.path.basename(folder), + name=name, path=self.path, ) + # Fix for MuMu12 v4.0.4, default instance of which has no forward record in vbox config + else: + instance = EmulatorInstance( + serial=serial, + name=name, + path=self.path, + ) + if instance.MuMuPlayer12_id: + instance.serial = f'127.0.0.1:{16384 + 32 * instance.MuMuPlayer12_id}' + yield instance elif self == Emulator.MEmuPlayer: # ./MemuHyperv VMs/{name}/{name}.memu for folder in self.list_folder('./MemuHyperv VMs', is_dir=True):