Pressing buttons in Rewind should now cancel rewind mode

Author: LIJI32

iOS/GBBackgroundView.m

@@ -450,6 +450,13 @@ - (void)touchesChanged
             [[GBHapticManager sharedManager] doTapHaptic];
         }
         _lastMask = mask;
+        
+        GBViewController *viewController = self.viewController;
+        GBRunMode runMode = viewController.runMode;
+        if (runMode == GBRunModeRewind || runMode == GBRunModePaused) {
+            viewController.runMode = GBRunModeNormal;
+            [self fadeOverlayOut];
+        }
     }
 }
 

iOS/GBViewController.m

@@ -697,6 +697,10 @@ - (void)controller:(GCController *)controller buttonChanged:(GCControllerButtonI
         case GBSelect:
         case GBStart:
             GB_set_key_state(&_gb, (GB_key_t)gbButton, button.value > 0.25);
+            if (_runMode == GBRunModeRewind || _runMode == GBRunModePaused) {
+                self.runMode = GBRunModeNormal;
+                [_backgroundView fadeOverlayOut];
+            }
             break;
         case GBRapidA:
             _rapidA = button.value > 0.25;
@@ -795,6 +799,10 @@ - (void)controller:(GCController *)controller axisChanged:(GCControllerDirection
     GB_set_key_state(&_gb, GB_KEY_RIGHT, right);
     GB_set_key_state(&_gb, GB_KEY_UP, up);
     GB_set_key_state(&_gb, GB_KEY_DOWN, down);
+    if (_runMode == GBRunModeRewind || _runMode == GBRunModePaused) {
+        self.runMode = GBRunModeNormal;
+        [_backgroundView fadeOverlayOut];
+    }
 }
 
 - (void)controller:(GCController *)controller motionChanged:(GCMotion *)motion
@@ -1649,6 +1657,12 @@ - (void)vblankWithType:(GB_vblank_type_t)type
         _rapidBCount++;
         GB_set_key_state(&_gb, GB_KEY_B, !(_rapidBCount & 2));
     }
+    if (_rapidA || _rapidB) {
+        if (_runMode == GBRunModeRewind || _runMode == GBRunModePaused) {
+            self.runMode = GBRunModeNormal;
+            [_backgroundView fadeOverlayOut];
+        }
+    }
     _rewind = _runMode == GBRunModeRewind;
 }