diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-04-14 18:51:33 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-04-14 18:51:33 +0200 |
| commit | 0888eb3d4d9d678cc91c54eb0f1b5b5a31090bc5 (patch) | |
| tree | 582a25a3cbe5fcf014d8fc6694ce295d820016a5 /app/src/main | |
| parent | c008ab0e0e7f25afe47a6fca906426820b5dad64 (diff) | |
| parent | 94ccdbfcc441d2992f108e5fa90733b54ab763e6 (diff) | |
Merge branch 'bug/existing-tests-fail-with-the-new-Gradle-connectedCheck-task-#5482' into develop
Diffstat (limited to 'app/src/main')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Dashboard.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java index b388b84a..292434c7 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java +++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java @@ -114,7 +114,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf View view = ((ViewGroup)findViewById(android.R.id.content)).getChildAt(0); logInDialog(view, Bundle.EMPTY); } - } else if(resultCode == RESULT_CANCELED && data.hasExtra(ACTION_QUIT)) { + } else if(resultCode == RESULT_CANCELED && (data == null || data.hasExtra(ACTION_QUIT))) { finish(); } else configErrorDialog(); |