Merge pull request Catrobat#3362 from 84n4n4/CATROID-379

CATROID-379 media download dialog update progress crashes
Aman09072000 · Oct 11, 2019 · 0793a57 · 0793a57
2 parents 11922cf + 8c6f4e8
commit 0793a57
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/WebViewActivity.java b/catroid/src/main/java/org/catrobat/catroid/ui/WebViewActivity.java
@@ -219,14 +219,18 @@ public void createProgressDialog(String mediaName) {
 		progressDialog.setProgress(0);
 		progressDialog.setMax(100);
 		progressDialog.setProgressNumberFormat(null);
-		progressDialog.show();
+		if (!isFinishing()) {
+			progressDialog.show();
+		}
 	}
 
 	public void updateProgressDialog(long progress) {
 		if (progress == 100) {
-			progressDialog.setProgress(progressDialog.getMax());
-			setResult(RESULT_OK, resultIntent);
-			progressDialog.dismiss();
+			if (progressDialog.isShowing() && !isFinishing()) {
+				progressDialog.setProgress(progressDialog.getMax());
+				setResult(RESULT_OK, resultIntent);
+				progressDialog.dismiss();
+			}
 			finish();
 		} else {
 			progressDialog.setProgress((int) progress);