diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-02-27 23:22:53 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-02-27 23:22:53 +0100 |
| commit | 57fffc6e3af2ddd8ec61482370265142d94561af (patch) | |
| tree | c78081171a1c9e480980e89fdd747cbfc509345c /main | |
| parent | 0633e0813a6f84d2fa52dd0c26db8f736dacfeb9 (diff) | |
| parent | 38e04c459383c1563a70f8086312c1b29ae0cc36 (diff) | |
| download | cgeo-57fffc6e3af2ddd8ec61482370265142d94561af.zip cgeo-57fffc6e3af2ddd8ec61482370265142d94561af.tar.gz cgeo-57fffc6e3af2ddd8ec61482370265142d94561af.tar.bz2 | |
Merge branch 'release' into upstream
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/cgeo/geocaching/activity/Progress.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/src/cgeo/geocaching/activity/Progress.java b/main/src/cgeo/geocaching/activity/Progress.java index 5fc64f2..2710023 100644 --- a/main/src/cgeo/geocaching/activity/Progress.java +++ b/main/src/cgeo/geocaching/activity/Progress.java @@ -39,7 +39,7 @@ public class Progress { } public synchronized void show(final Context context, final String title, final String message, final boolean indeterminate, final Message cancelMessage) { - if (dialog == null) { + if (!isShowing()) { createProgressDialog(context, title, message, cancelMessage); dialog.setIndeterminate(indeterminate); dialog.show(); @@ -47,7 +47,7 @@ public class Progress { } public synchronized void show(final Context context, final String title, final String message, final int style, final Message cancelMessage) { - if (dialog == null) { + if (!isShowing()) { createProgressDialog(context, title, message, cancelMessage); dialog.setProgressStyle(style); dialog.show(); |