Apple-2-Tools/kegs-android
1
0
Fork 0
mirror of https://github.com/jamessanford/kegs.git synced 2024-06-07 16:03:45 +00:00
Code Issues Projects Releases Wiki Activity

Only run DownloadImage once assets are loaded.

Browse Source
This commit is contained in:
James Sanford 2012-10-29 23:53:14 -07:00
parent fc25a07c1e
commit 6018ceaed2
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/froop/app/kegs/KegsMain.java
View File

@ -44,6 +44,7 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
private boolean mAssetsReady = false;
private boolean mDownloadReady = false;
private boolean mDownloadStarted = false;
private boolean mDownloadAborted = false;
private boolean mModeMouse = true;
@ -114,6 +115,17 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
private void loadDiskImageWhenReady(final DiskImage image) {
final AssetFragment frag = (AssetFragment)getSupportFragmentManager().findFragmentByTag(FRAGMENT_ASSET);
// Only start download when the assets are ready.
if (mAssetsReady && !mDownloadStarted) {
mDownloadStarted = true;
final String imagePath = mConfigFile.getImagePath();
if (android.os.Build.VERSION.SDK_INT >= 11) {
new DownloadImage(this, imagePath, image).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} else {
new DownloadImage(this, imagePath, image).execute();
}
}
// This code is lame.
if (mDownloadAborted) {
if (frag != null) {
@ -160,16 +172,10 @@ public class KegsMain extends SherlockFragmentActivity implements KegsKeyboard.S
getThread().doPowerOff();
}
mDownloadStarted = false;
mDownloadReady = false;
mDownloadAborted = false;
final String imagePath = mConfigFile.getImagePath();
if (android.os.Build.VERSION.SDK_INT >= 11) {
new DownloadImage(this, imagePath, image).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} else {
new DownloadImage(this, imagePath, image).execute();
}
loadDiskImageWhenReady(image);
}