commit 035fe333730247f4c64a1074bf97d69eda6060e5
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Sun Jan 19 23:49:59 2020 +0000

    RubikCube: progress with scrambling

diff --git a/src/main/java/org/distorted/effect/ScrambleEffect.java b/src/main/java/org/distorted/effect/ScrambleEffect.java
index 88089b0f..eb64dfd4 100644
--- a/src/main/java/org/distorted/effect/ScrambleEffect.java
+++ b/src/main/java/org/distorted/effect/ScrambleEffect.java
@@ -183,6 +183,11 @@ public abstract class ScrambleEffect implements EffectListener
     else
       {
       mLastVector = -1;
+
+      if( mEffectReturned == mCubeEffectNumber+mNodeEffectNumber )
+        {
+        mListener.effectFinished(FAKE_EFFECT_ID);
+        }
       }
     }
 
@@ -220,6 +225,11 @@ public abstract class ScrambleEffect implements EffectListener
         if( mEffectReturned == mCubeEffectNumber+mNodeEffectNumber )
           {
           disassignEffects();
+
+          if( mNumScramblesLeft==0 )
+            {
+            mListener.effectFinished(FAKE_EFFECT_ID);
+            }
           }
 
         return;
@@ -238,6 +248,11 @@ public abstract class ScrambleEffect implements EffectListener
         if( mEffectReturned == mCubeEffectNumber+mNodeEffectNumber )
           {
           disassignEffects();
+
+          if( mNumScramblesLeft==0 )
+            {
+            mListener.effectFinished(FAKE_EFFECT_ID);
+            }
           }
 
         return;
@@ -299,8 +314,6 @@ public abstract class ScrambleEffect implements EffectListener
       {
       nodeEffects.abortById(mNodeEffects[i].getID());
       }
-
-    mListener.effectFinished(FAKE_EFFECT_ID);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////