From 3110041a068ba41f6f85f32ce35f8569b0f4a2f6 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Mon, 27 May 2024 14:45:37 -0400 Subject: [PATCH] Don't seem to move near disk folder if not loading. --- Machines/Acorn/Archimedes/Archimedes.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Machines/Acorn/Archimedes/Archimedes.cpp b/Machines/Acorn/Archimedes/Archimedes.cpp index 459f8f5bf..c77490c6b 100644 --- a/Machines/Acorn/Archimedes/Archimedes.cpp +++ b/Machines/Acorn/Archimedes/Archimedes.cpp @@ -261,15 +261,18 @@ class ConcreteMachine: // Wait a further second, mouse down to (32, 240), left click. // That'll trigger disk access. Then move up to the top left, // in anticipation of the appearance of a window. - CursorActionBuilder(cursor_actions_) -// .wait(5 * 24'000'000) + auto &builder = CursorActionBuilder(cursor_actions_) .move_to(IconBarDriveX, IconBarY) - .click(0) - .set_phase( - target_program_.empty() ? AutoloadPhase::Ended : AutoloadPhase::WaitingForDiskContents - ) - .move_to(IconBarDriveX, 36); // Just a guess of 'close' to where the program to launch - // will probably be, to have the cursor already nearby. + .click(0); + + if(target_program_.empty()) { + builder.set_phase(AutoloadPhase::Ended); + } else { + builder + .set_phase(AutoloadPhase::WaitingForDiskContents) + .move_to(IconBarDriveX, 80); // Just a guess of 'close' to where the program to launch + // will probably be, to have the cursor broadly nearby. + } autoload_phase_ = AutoloadPhase::OpeningDisk; }