commit b376bfd73a90d0a5ef5888320c8e17c23ae3253d
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Sep 8 00:29:54 2020 +0100

    Fix for a crasher.

diff --git a/src/main/java/org/distorted/objects/RubikObject.java b/src/main/java/org/distorted/objects/RubikObject.java
index 358ae556..55d7b4c7 100644
--- a/src/main/java/org/distorted/objects/RubikObject.java
+++ b/src/main/java/org/distorted/objects/RubikObject.java
@@ -165,7 +165,7 @@ public abstract class RubikObject extends DistortedNode
     mEffects.apply(mScaleEffect);
 
     // Now postprocessed effects (the glow when you solve an object) require component centers. In
-    // order for the center to be in front of the object, we need to set the center to be behind it.
+    // order for the effect to be in front of the object, we need to set the center to be behind it.
     getMesh().setComponentCenter(0,0,0,-0.1f);
 
     attach( new DistortedNode(mTexture,mEffects,mMesh) );
diff --git a/src/main/java/org/distorted/states/RubikStatePlay.java b/src/main/java/org/distorted/states/RubikStatePlay.java
index ec639d53..b6b4893c 100644
--- a/src/main/java/org/distorted/states/RubikStatePlay.java
+++ b/src/main/java/org/distorted/states/RubikStatePlay.java
@@ -118,6 +118,7 @@ public class RubikStatePlay extends RubikStateAbstract implements AdapterView.On
     LinearLayout layoutTop = act.findViewById(R.id.upperBar);
     layoutTop.removeAllViews();
 
+    setupObjectWindow(act,width);
     setupObjectButton(act,width);
     layoutTop.addView(mObjButton);
     setupLevelSpinner(act,width);
@@ -125,10 +126,7 @@ public class RubikStatePlay extends RubikStateAbstract implements AdapterView.On
     setupPlayButton(act,width);
     layoutTop.addView(mPlayButton);
 
-    setupObjectWindow(act,width);
-
     // BOT ////////////////////////////
-
     LinearLayout layoutLeft = act.findViewById(R.id.mainBarLeft);
     layoutLeft.removeAllViews();
 
@@ -140,10 +138,9 @@ public class RubikStatePlay extends RubikStateAbstract implements AdapterView.On
     LinearLayout layoutRight = act.findViewById(R.id.mainBarRight);
     layoutRight.removeAllViews();
 
+    setupMenuWindow(act,width);
     setupMenuButton(act,width);
     layoutRight.addView(mMenuButton);
-
-    setupMenuWindow(act,width);
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////