Merge pull request #1022 from campbeb/fix1021

Fix #1021 finish() when the dialog is done

1 files changed, 7 insertions, 1 deletions

diff --git a/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java b/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java
index 4e889e0..6ff9450 100644
--- a/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java
+++ b/cgeo-calendar/src/cgeo/calendar/CalendarActivity.java
@@ -57,7 +57,6 @@ public final class CalendarActivity extends Activity {
             finish();
             return;
         }
-        finish();
     }
 
     private String getParameter(final String paramKey) {
@@ -123,6 +122,13 @@ public final class CalendarActivity extends Activity {
                 final Integer[] keys = calendars.keySet().toArray(new Integer[calendars.size()]);
                 final Integer calendarId = keys[item];
                 addToCalendar(calendarId);
+                finish();
+            }
+        });
+        builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override
+            public void onCancel(DialogInterface dialog) {
+                finish();
             }
         });
         builder.create().show();