updates

objective-see · Sep 23, 2024 · d635db7 · d635db7
1 parent 450e69e
commit d635db7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 24 deletions.
diff --git a/Application/Application/AVMonitor.m b/Application/Application/AVMonitor.m
@@ -1440,34 +1440,25 @@ -(NSUInteger)shouldShowNotification:(Event*)event
 
     } //PREF_NO_EXTERNAL_DEVICES_MODE
 
-    //macOS sometimes toggles / delivers 2x events for same device
+    //macOS sometimes toggles delivers 2x events for same device
     if(deviceLastEvent.deviceType == event.deviceType)
     {
         //ignore if last event was < 1.0s ago
         if([event.timestamp timeIntervalSinceDate:deviceLastEvent.timestamp] < 1.0f)
         {
-            //set result
-            result = NOTIFICATION_SPURIOUS;
-
-            //dbg msg
-            os_log_debug(logHandle, "ignoring event, as last event happened <1.0s ago");
-
-            //bail
-            goto bail;
-        }
-
-        //ignore if last event was same state
-        if( (deviceLastEvent.state == event.state) &&
-            ([event.timestamp timeIntervalSinceDate:deviceLastEvent.timestamp] < 1.0f) )
-        {
-            //set result
-            result = NOTIFICATION_SPURIOUS;
-
-            //dbg msg
-            os_log_debug(logHandle, "ignoring event as it was same state as last (%ld), and happened <1.0s ago", (long)event.state);
-
-            //bail
-            goto bail;
+            //ignore if last event was same state
+            if( (deviceLastEvent.state == event.state) &&
+                ([event.timestamp timeIntervalSinceDate:deviceLastEvent.timestamp] < 1.0f) )
+            {
+                //set result
+                result = NOTIFICATION_SPURIOUS;
+
+                //dbg msg
+                os_log_debug(logHandle, "ignoring event as it was same state as last (%ld), and happened <1.0s ago", (long)event.state);
+
+                //bail
+                goto bail;
+            }
         }
 
     } //same device

diff --git a/Installer/Installer.xcodeproj/project.pbxproj b/Installer/Installer.xcodeproj/project.pbxproj
@@ -341,7 +341,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#Note: To build uninstaller for app (menu)\n# 0. Delete this script and Installer.app from App's on-disk folder \n# 1. Build Installer\n# 2. Copy into App \"Uninstaller\" folder (& proj if needed)\n# 3. Re-add script, and then build (archive) for deployment\n\n#archive\n# copy in main application \nif [[ $BUILT_PRODUCTS_DIR = *\"ArchiveIntermediates\"* ]]; then\n    cp -R -f \"$PROJECT_TEMP_ROOT/UninstalledProducts/macosx/OverSight.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\n    \n#normal build\n# delete and copy in main application \nelse\n\nrm -rf  \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources/OverSight.app\"\ncp -R -f \"$BUILT_PRODUCTS_DIR/OverSight.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\n\nfi\n";
+			shellScript = "#Note: To build uninstaller for app (menu)\n# 0. Delete this script and Installer.app from App's on-disk folder \n# 1. Build Installer\n# 2. Copy into App \"Uninstaller\" folder (& proj if needed)\n# 3. Re-add script, and then build (archive) for deployment\n\n#archive\n# copy in main application \nif [[ $BUILT_PRODUCTS_DIR = *\"ArchiveIntermediates\"* ]]; then\n    cp -R -f \"$PROJECT_TEMP_ROOT/UninstalledProducts/macosx/OverSight.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\n    \n#normal build\n# delete and copy in main application \nelse\n\nrm -rf  \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources/OverSight.app\"\ncp -R -f \"$BUILT_PRODUCTS_DIR/OverSight.app\" \"$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources\"\n\nfi\n\n";
 		};
 /* End PBXShellScriptBuildPhase section */