Skip to content

Commit 2abb1a9

Browse files
authored
Merge pull request cocos2d#2 from schnhegde/fix/crash-fixes-v1.0
fixed crash when clicking on locked level and onSkudetails issue
2 parents 4aa4de8 + 4b63be8 commit 2abb1a9

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

proj.android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
applicationId "com.vinaykumar.sokoban"
1212
minSdkVersion PROP_MIN_SDK_VERSION
1313
targetSdkVersion PROP_TARGET_SDK_VERSION
14-
versionCode 12
15-
versionName "1.0"
14+
versionCode 13
15+
versionName "1.01"
1616

1717
externalNativeBuild {
1818
if (PROP_BUILD_TYPE == 'ndk-build') {

proj.android/app/src/org/cocos2dx/cpp/IAPPlugin.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,12 @@ public void onBillingServiceDisconnected() {
9696
@Override
9797
public void onSkuDetailsResponse(BillingResult billingResult,
9898
List<SkuDetails> skuDetailsList) {
99-
for(int i = 0; i < skuDetailsList.size(); i++) {
100-
SkuDetails detail = skuDetailsList.get(i);
101-
String sku = detail.getSku();
102-
skudetails.put(sku, detail);
99+
if (skuDetailsList) {
100+
for(int i = 0; i < skuDetailsList.size(); i++) {
101+
SkuDetails detail = skuDetailsList.get(i);
102+
String sku = detail.getSku();
103+
skudetails.put(sku, detail);
104+
}
103105
}
104106
}
105107

src/scenes/LevelSelect.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,10 @@ void LevelSelect::CBBtnLevel(Ref* pSender, Widget::TouchEventType type) {
188188
if (type == Widget::TouchEventType::ENDED) {
189189
SoundUtil::getInstance()->playEfxBtnTouched();
190190
Button* buttonClicked = reinterpret_cast<Button*>(pSender);
191-
int levelNo = stoi(buttonClicked->getTitleText());
192-
UiUtil::transitionFade(GameScene::createScene(levelNo));
191+
if (buttonClicked->getTitleText() != "") {
192+
int levelNo = stoi(buttonClicked->getTitleText());
193+
UiUtil::transitionFade(GameScene::createScene(levelNo));
194+
}
193195
}
194196
}
195197

0 commit comments

Comments
 (0)