commit 88d8ccb6c641191862848900be597ea5f0b49aa3
Author: leszek <leszek@koltunski.pl>
Date:   Wed Nov 15 16:05:46 2023 +0100

    progress with PlayActivity

diff --git a/src/main/java/org/distorted/playui/PlayActivity.java b/src/main/java/org/distorted/playui/PlayActivity.java
index d8e84a26..32896066 100644
--- a/src/main/java/org/distorted/playui/PlayActivity.java
+++ b/src/main/java/org/distorted/playui/PlayActivity.java
@@ -221,7 +221,6 @@ public class PlayActivity extends AppCompatActivity
 
       SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
       restorePreferences(preferences);
-      restoreMoves(preferences);
 
       ScreenList sl =  mJustStarted ?
                       (mModeFree ? ScreenList.FREE : ScreenList.SCRA) :
@@ -229,17 +228,19 @@ public class PlayActivity extends AppCompatActivity
 
       ScreenList.switchScreen(this,sl);
 
-      mJustStarted = false;
+      if( !mJustStarted ) restoreMoves(preferences);
 
       if( mObjectName.length()>0 )
         {
         changeIfDifferent(mObjectName,mObjectLocal,mObjectOrdinal,control);
         }
 
-      if( !mModeFree )
+      if( mJustStarted && !mModeFree )
         {
         control.scrambleObject(mNumScrambles);
         }
+
+      mJustStarted = false;
       }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/main/java/org/distorted/playui/ScreenList.java b/src/main/java/org/distorted/playui/ScreenList.java
index fe55eb34..7679b019 100644
--- a/src/main/java/org/distorted/playui/ScreenList.java
+++ b/src/main/java/org/distorted/playui/ScreenList.java
@@ -81,8 +81,6 @@ public enum ScreenList
 
   public static void savePreferences(SharedPreferences.Editor editor)
     {
-    android.util.Log.e("D", "saving current state: "+mCurrScreen.name() );
-
     editor.putString("curr_state_name", mCurrScreen.name() );
     }
 
@@ -92,8 +90,6 @@ public enum ScreenList
     {
     String currScreenName = preferences.getString("curr_state_name", ScreenList.SCRA.name() );
     mCurrScreen = getScreenFromName(currScreenName);
-
-    android.util.Log.e("D", "restoring current state: "+currScreenName );
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////