Skip to content

Commit b1165f7

Browse files
committed
Fix crash SDLActivity.java
1 parent 4ee73b4 commit b1165f7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

sdlplugin/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ android {
2424
applicationId "com.duy.c.cpp.compiler.sdlplugin"
2525
minSdkVersion rootProject.ext.minSdkVersion
2626
targetSdkVersion rootProject.ext.targetSdkVersion
27-
versionCode 3
28-
versionName "1.0.3"
27+
versionCode 4
28+
versionName "1.0.4"
2929
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3030
multiDexEnabled true
3131
ndk {

sdlplugin/src/main/java/com/duy/c/cpp/compiler/sdlplugin/sdlpluginActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private boolean isPermissionGranted() {
6666

6767
private void initUI() {
6868
mSdCardAppDir = new File(Environment.getExternalStorageDirectory(), "CCPlusPlusNIDE");
69-
if (!mIsPaused && getIntent().getExtras() == null) {
69+
if (!mIsPaused && (getIntent().getExtras() == null || !getIntent().hasExtra("sdlmain"))) {
7070
if (mSdCardAppDir.exists() && mSdCardAppDir.isDirectory()) {
7171
File include = new File(mSdCardAppDir, "/SDL/include");
7272
File lib = new File(mSdCardAppDir, "/SDL/lib");

sdlplugin/src/main/java/org/libsdl/app/SDLActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ protected void onCreate(Bundle savedInstanceState) {
279279
String sdlmain = getIntent().getStringExtra("sdlmain");
280280
Log.e(TAG, "sdlmain is " + sdlmain);
281281

282-
String libDir = getCacheDir().getParentFile().getAbsolutePath() + "/mylib";
283-
String libFile = libDir + "/" + (new File(sdlmain)).getName();
282+
String libDir = new File(getCacheDir().getParentFile(), "mylib").getAbsolutePath();
283+
String libFile = new File(libDir, (new File(sdlmain)).getName()).getAbsolutePath();
284284

285285
if ((new File(sdlmain)).exists()) {
286286
if (!(new File(libDir)).exists()) {

0 commit comments

Comments
 (0)