Merge branch 'master'

dirkwhoffmann · Nov 17, 2024 · bde68a0 · bde68a0
2 parents f817b85 + b1da479
commit bde68a0
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 23 deletions.
diff --git a/Emulator/Base/Thread.cpp b/Emulator/Base/Thread.cpp
@@ -356,29 +356,26 @@ void
 Thread::changeStateTo(ExecState requestedState)
 {
     assertLaunched();
-
+    
     if (isEmulatorThread()) {
-
+        
         // Switch immediately
         switchState(requestedState);
         assert(state == requestedState);
-
+        
     } else {
-
+        
         // Remember the requested state
         newState = requestedState;
-
+        
         // Request the change
         assert(stateChangeRequest.test() == false);
         stateChangeRequest.test_and_set();
         assert(stateChangeRequest.test() == true);
-
-        if (!isEmulatorThread()) {
-
-            // Wait until the change has been performed
-            stateChangeRequest.wait(true);
-            assert(stateChangeRequest.test() == false);
-        }
+
+        // Wait until the change has been performed
+        stateChangeRequest.wait(true);
+        assert(stateChangeRequest.test() == false);
     }
 }
 

diff --git a/Emulator/Components/CIA/CIA.cpp b/Emulator/Components/CIA/CIA.cpp
@@ -182,9 +182,12 @@ CIA::cacheStats(CIAStats &result) const
 {
     {   SYNCHRONIZED
 
-        result.idleSince = idleSince();
-        result.idleTotal = idleTotal() + result.idleSince;
-        result.idlePercentage =  clock ? (double)result.idleTotal / (double)clock : 100.0;
+        auto idle = idleSince();
+        auto total = idleTotal() + idle;
+
+        result.idleSince = idle;
+        result.idleTotal = total;
+        result.idlePercentage =  clock ? double(total) / double(clock + idle) : 100.0;
     }
 }
 

diff --git a/Emulator/Peripherals/Drive/FloppyDrive.cpp b/Emulator/Peripherals/Drive/FloppyDrive.cpp
@@ -1114,7 +1114,7 @@ FloppyDrive::insertMediaFile(class MediaFile &file, bool wp)
 {
     try {
 
-        const ADFFile &adf = dynamic_cast<const ADFFile &>(file);
+        const FloppyFile &adf = dynamic_cast<const FloppyFile &>(file);
         swapDisk(std::make_unique<FloppyDisk>(adf, wp));
 
     } catch (...) {

diff --git a/Emulator/Peripherals/Drive/HardDrive.cpp b/Emulator/Peripherals/Drive/HardDrive.cpp
@@ -711,7 +711,7 @@ HardDrive::write(isize offset, isize length, u32 addr)
                 wtStream[objid].write((char *)(data.ptr + offset), length);
             }
 
-            setFlag(FLAG_PROTECTED, true);
+            setFlag(FLAG_MODIFIED, true);
         }
 
         // Inform the GUI

diff --git a/Emulator/config.h b/Emulator/config.h
@@ -17,13 +17,13 @@
 #define VER_MAJOR 3
 #define VER_MINOR 0
 #define VER_SUBMINOR 0
-#define VER_BETA 1
+#define VER_BETA 2
 
 // Snapshot version number
 #define SNP_MAJOR 3
 #define SNP_MINOR 0
 #define SNP_SUBMINOR 0
-#define SNP_BETA 1
+#define SNP_BETA 2
 
 // Uncomment this setting in a release build
 // #define RELEASEBUILD

diff --git a/GUI/Peripherals/KeyboardController.swift b/GUI/Peripherals/KeyboardController.swift
@@ -81,6 +81,9 @@ class KeyboardController: NSObject {
 
     func flagsChanged(with event: NSEvent) {
 
+        // Intercept if the console is open
+        if renderer.console.isVisible { return }
+
         // Check for a mouse controlling key combination
         if parent.metal.checkForMouseKeys(with: event) { return }
 

diff --git a/vAmiga.xcodeproj/project.pbxproj b/vAmiga.xcodeproj/project.pbxproj
@@ -2868,7 +2868,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 240915;
+				CURRENT_PROJECT_VERSION = 240920;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = NO;
@@ -2889,7 +2889,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 3.0b1;
+				MARKETING_VERSION = 3.0b2;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2919,7 +2919,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 240915;
+				CURRENT_PROJECT_VERSION = 240920;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_APP_SANDBOX = NO;
@@ -2938,7 +2938,7 @@
 				);
 				LLVM_LTO = YES_THIN;
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 3.0b1;
+				MARKETING_VERSION = 3.0b2;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
 				PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
 				PRODUCT_NAME = "$(TARGET_NAME)";