Ensure the previous selection timer is cancelled if the random button…

… was released
osudroid · Aug 20, 2023 · 412e213 · 412e213
1 parent 821c12e
commit 412e213
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java b/src/ru/nsu/ccfit/zuev/osu/menu/SongMenu.java
@@ -533,11 +533,7 @@ public void run() {
 
                         @Override
                         public boolean cancel() {
-                            if (previousSelectionTimer != null) {
-                                previousSelectionTimer.cancel();
-                                previousSelectionTimer = null;
-                            }
-
+                            previousSelectionTimer = null;
                             return super.cancel();
                         }
                     }, previousSelectionInterval, previousSelectionInterval);
@@ -547,14 +543,15 @@ public boolean cancel() {
                 }
                 if (pSceneTouchEvent.isActionUp()) {
                     setFrame(0);
-                    if (!isSelectComplete) {
-                        return true;
-                    }
 
                     if (previousSelectionTimer != null) {
                         previousSelectionTimer.cancel();
                     }
 
+                    if (!isSelectComplete) {
+                        return true;
+                    }
+
                     if (!moved && !previousSelectionPerformed) {
                         velocityY = 0;
                         if (items.size() <= 1) {