sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Null check on audio renderer in the onPause and onResume of the android Harness. The audio renderer appears to be null (wich is another issue)

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9171 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2012-02-17 13:04:53 +00:00
parent afc2710626
commit a3497ca8b2
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/src/android/com/jme3/app/AndroidHarness.java
View File

@ -219,10 +219,12 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
//resume the audio //resume the audio
AudioRenderer result = app.getAudioRenderer(); AudioRenderer result = app.getAudioRenderer();
if (result != null) {
if (result instanceof AndroidAudioRenderer) { if (result instanceof AndroidAudioRenderer) {
AndroidAudioRenderer renderer = (AndroidAudioRenderer) result; AndroidAudioRenderer renderer = (AndroidAudioRenderer) result;
renderer.resumeAll(); renderer.resumeAll();
} }
}
isGLThreadPaused = false; isGLThreadPaused = false;
logger.info("onResume"); logger.info("onResume");
@ -237,11 +239,13 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
//pause the audio //pause the audio
AudioRenderer result = app.getAudioRenderer(); AudioRenderer result = app.getAudioRenderer();
if (result != null) {
logger.info("pause: " + result.getClass().getSimpleName()); logger.info("pause: " + result.getClass().getSimpleName());
if (result instanceof AndroidAudioRenderer) { if (result instanceof AndroidAudioRenderer) {
AndroidAudioRenderer renderer = (AndroidAudioRenderer) result; AndroidAudioRenderer renderer = (AndroidAudioRenderer) result;
renderer.pauseAll(); renderer.pauseAll();
} }
}
isGLThreadPaused = true; isGLThreadPaused = true;
logger.info("onPause"); logger.info("onPause");
@ -295,9 +299,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
@Override @Override
public void run() { public void run() {
AlertDialog dialog = new AlertDialog.Builder(AndroidHarness.this) // .setIcon(R.drawable.alert_dialog_icon) AlertDialog dialog = new AlertDialog.Builder(AndroidHarness.this) // .setIcon(R.drawable.alert_dialog_icon)
.setTitle(finalTitle) .setTitle(finalTitle).setPositiveButton("Kill", AndroidHarness.this).setMessage(finalMsg).create();
.setPositiveButton("Kill", AndroidHarness.this)
.setMessage(finalMsg).create();
dialog.show(); dialog.show();
} }
}); });
@ -332,10 +334,7 @@ public class AndroidHarness extends Activity implements TouchListener, DialogInt
@Override @Override
public void run() { public void run() {
AlertDialog dialog = new AlertDialog.Builder(AndroidHarness.this) // .setIcon(R.drawable.alert_dialog_icon) AlertDialog dialog = new AlertDialog.Builder(AndroidHarness.this) // .setIcon(R.drawable.alert_dialog_icon)
.setTitle(exitDialogTitle) .setTitle(exitDialogTitle).setPositiveButton("Yes", AndroidHarness.this).setNegativeButton("No", AndroidHarness.this).setMessage(exitDialogMessage).create();
.setPositiveButton("Yes", AndroidHarness.this)
.setNegativeButton("No", AndroidHarness.this)
.setMessage(exitDialogMessage).create();
dialog.show(); dialog.show();
} }
}); });