UE-16552 - Application can crash when returning from a paused OBB download

- Changed logic for dealing with the download activity being backed out of
- Updated .bat file writing so that a second bat file which doesn't push the obb (but can remove it) is written

[CL 2581067 by Robert Jones in Main branch]
This commit is contained in:
Robert Jones
2015-06-09 06:34:08 -04:00
committed by rob.jones@epicgames.com
parent e7e8877766
commit 0ca3f7a241
3 changed files with 99 additions and 60 deletions

View File

@@ -663,10 +663,13 @@ public class DownloaderActivity extends Activity implements IDownloaderClient {
@Override
protected void onPause() {
super.onPause();
GameActivity.Log.debug("In onPause");
if(OutputData.getIntExtra(GameActivity.DOWNLOAD_RETURN_NAME, GameActivity.DOWNLOAD_NO_RETURN_CODE) == GameActivity.DOWNLOAD_NO_RETURN_CODE)
{
GameActivity.Log.debug("onPause returning that user quit the download.");
OutputData.putExtra(GameActivity.DOWNLOAD_RETURN_NAME, GameActivity.DOWNLOAD_USER_QUIT);
setResult(RESULT_OK, OutputData);
}
}
@@ -679,6 +682,7 @@ public class DownloaderActivity extends Activity implements IDownloaderClient {
mDownloaderClientStub.disconnect(this);
}
super.onStop();
setResult(RESULT_OK, OutputData);
}
/**