Only select nearest contact if not in the list

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/js/components/contactList/contactList_controller.js b/js/components/contactList/contactList_controller.js
index 1e09c179..f13bf76e 100644
--- a/js/components/contactList/contactList_controller.js
+++ b/js/components/contactList/contactList_controller.js
@@ -104,7 +104,12 @@ angular.module('contactsApp')
 						ContactService.getAll().then(function(contacts) {
 							ctrl.contactList = contacts;
 							ctrl.loading = false;
-							ctrl.selectNearestContact(ctrl.getSelectedId());
+							// Only change contact if the selectd one is not in the list anymore
+							if(ctrl.contactList.findIndex(function(contact) {
+								return contact.uid() === ctrl.getSelectedId();
+							}) === -1) {
+								ctrl.selectNearestContact(ctrl.getSelectedId());
+							}
 						});
 					});
 					break;