Skip to content

Commit fce8f96

Browse files
committed
1 parent b336313 commit fce8f96

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

Diff for: source/online/objects/ProfileBox.hx

+10-2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ class ProfileBox extends FlxSpriteGroup {
4949
}
5050

5151
public function updateData(leUser:String, leVerified:Bool) {
52+
if (destroyed)
53+
return;
54+
5255
user = leUser;
5356
verified = leVerified;
5457

@@ -70,12 +73,14 @@ class ProfileBox extends FlxSpriteGroup {
7073
else
7174
profileData = null;
7275

73-
if (!destroyed)
74-
Waiter.put(creativo);
76+
Waiter.put(creativo);
7577
});
7678
}
7779

7880
public function creativo() {
81+
if (destroyed)
82+
return;
83+
7984
if (autoUpdateThings) {
8085
text.text = "";
8186
desc.text = "";
@@ -147,6 +152,9 @@ class ProfileBox extends FlxSpriteGroup {
147152
var maxTextSizeDesc:Float = 0.0;
148153
var _cardHeight:Int;
149154
public function updatePositions() {
155+
if (destroyed)
156+
return;
157+
150158
avatar.x = x + 20;
151159
avatar.y = y + height / 2 - avatar.height / 2;
152160
text.x = avatar.x + avatar.width + 20;

Diff for: source/online/states/SkinsState.hx

+5-3
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ class SkinsState extends MusicBeatState {
503503
switchState(() -> new DownloaderState('collection:110039'));
504504
}
505505

506-
if (character.members[0] != null) {
506+
if (character.members[0]?.animation?.curAnim != null) {
507507
switch (character.members[0].animation.curAnim.name) {
508508
case 'singRIGHT':
509509
camFollow.x += 20;
@@ -653,7 +653,9 @@ class SkinsState extends MusicBeatState {
653653

654654
var daCharacter = new Character(0, 0, curCharName, flipped);
655655
daCharacter.scrollFactor.set(1.2, 1.2);
656-
daCharacter.graphic.bitmap.disposeImage();
656+
if (daCharacter?.graphic?.bitmap != null)
657+
daCharacter.graphic.bitmap.disposeImage();
658+
657659
character.add(daCharacter);
658660

659661
character.members[0].x = 420 + character.members[0].positionArray[0];
@@ -720,7 +722,7 @@ class SkinsState extends MusicBeatState {
720722
if (stopUpdates)
721723
return;
722724

723-
if (character.members[0] != null && character.members[0].animation.curAnim.finished)
725+
if (character.members[0]?.animation?.curAnim != null && character.members[0].animation.curAnim.finished)
724726
character.members[0].dance();
725727
}
726728

Diff for: source/states/FreeplayState.hx

+1-1
Original file line numberDiff line numberDiff line change
@@ -924,7 +924,7 @@ class FreeplayState extends MusicBeatState
924924
}
925925
}
926926
else {
927-
if (controls.BACK) {
927+
if (controls.BACK || songs[curSelected] == null) {
928928
selected = false;
929929
selectedItem = 0;
930930
setDiffVisibility(true);

0 commit comments

Comments
 (0)