From 0cf509833a768882ea74f4d91201f32528772e31 Mon Sep 17 00:00:00 2001 From: Mygod Date: Fri, 25 Dec 2015 16:33:44 +0800 Subject: [PATCH] Fix dismissing ProgressDialog after activity destroyed --- src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index f6aa9677..64dc7616 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -537,8 +537,8 @@ class Shadowsocks } def clearDialog() { - if (progressDialog != null) { - progressDialog.dismiss() + if (progressDialog != null && progressDialog.isShowing) { + if (!isDestroyed) progressDialog.dismiss() progressDialog = null progressTag = -1 }