Merge branch 'tizen' into tizen_dev 43/78743/1
authorAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Wed, 6 Jul 2016 14:49:47 +0000 (17:49 +0300)
committerAleksandr Sapozhnik <a.sapozhnik@samsung.com>
Wed, 6 Jul 2016 14:49:47 +0000 (17:49 +0300)
Signed-off-by: Aleksandr Sapozhnik <a.sapozhnik@samsung.com>
Conflicts:
lib-contacts/src/Contacts/List/ListView.cpp

Change-Id: I0275c22d596a3d19f886779d2bed155dadd37c66

1  2 
lib-contacts/src/Contacts/List/ListView.cpp

@@@ -206,10 -207,13 +207,13 @@@ void ListView::onDeleteSelected(
                        contacts_disconnect_on_thread();
                };
  
-               auto popup = Ui::ProcessPopup::create(getEvasObject(), "IDS_PB_TPOP_DELETING_ING_ABB");
+               Ui::ProcessPopup *popup = nullptr;
+               if (results.size() > PROGRESS_RESULTS_LIMIT) {
 -                      popup = Ui::ProcessPopup::create(view->getEvasObject(), "IDS_PB_TPOP_DELETING_ING_ABB");
++                      popup = Ui::ProcessPopup::create(getEvasObject(), "IDS_PB_TPOP_DELETING_ING_ABB");
+               }
 -              new Thread(std::bind(task, std::move(results)), [view, popup] {
 +              new Thread(std::bind(task, std::move(results)), [this, popup] {
                        delete popup;
 -                      view->getPage()->close();
 +                      onSelectFinished();
                });
  
                return false;