Load current costume correctly

Author: adazem009

src/internal/scratch3reader.cpp

@@ -193,10 +193,6 @@ bool Scratch3Reader::load()
 
             // TODO: Add comments
 
-            // currentCostume
-            READER_STEP(step, "target -> currentCostume");
-            target->setCurrentCostume(jsonTarget["currentCostume"]);
-
             // costumes
             READER_STEP(step, "target -> costumes");
             auto costumes = jsonTarget["costumes"];
@@ -218,6 +214,10 @@ bool Scratch3Reader::load()
                 target->addCostume(costume);
             }
 
+            // currentCostume
+            READER_STEP(step, "target -> currentCostume");
+            target->setCurrentCostume(jsonToValue(jsonTarget["currentCostume"]).toInt() + 1);
+
             // sounds
             READER_STEP(step, "target -> sounds");
             auto sounds = jsonTarget["sounds"];

test/load_project/load_project_test.cpp

@@ -40,7 +40,7 @@ TEST(LoadProjectTest, EmptyProject)
         ASSERT_EQ(stage->blocks().size(), 0);
         ASSERT_EQ(stage->costumes().size(), 1);
         // TODO: Add comments
-        ASSERT_EQ(stage->currentCostume(), 0);
+        ASSERT_EQ(stage->currentCostume(), 1);
         ASSERT_EQ(stage->sounds().size(), 0);
         ASSERT_EQ(stage->layerOrder(), 0);
         ASSERT_EQ(stage->volume(), 100);
@@ -104,6 +104,7 @@ TEST(LoadProjectTest, LoadTestProject)
         ASSERT_EQ(sprite1->lists().size(), 1);
         ASSERT_EQ(sprite1->blocks().size(), 18);
         ASSERT_EQ(sprite1->costumes().size(), 2);
+        ASSERT_EQ(sprite1->currentCostume(), 2);
         ASSERT_EQ(sprite1->sounds().size(), 1);
         ASSERT_TRUE(sprite1->visible());
         ASSERT_EQ(sprite1->x(), 0);