From: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Date: Sat, 8 Sep 2018 07:43:22 +0000 (+0900)
Subject: Fix the mistake of generating new layerID
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=16b18c596468f0ac0eef9c8df2b67786b3fb00ab;p=apps%2Fagl-service-windowmanager-2017.git

Fix the mistake of generating new layerID

Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
---

diff --git a/src/wm_layer.cpp b/src/wm_layer.cpp
index 01e8950..cd381c2 100644
--- a/src/wm_layer.cpp
+++ b/src/wm_layer.cpp
@@ -127,8 +127,8 @@ unsigned WMLayer::getNewLayerID(const string& role)
         return ret;
     }
 
-    auto id_found = std::find(id_list.begin(), id_list.end(), ret);
-    if( (ret > this->idEnd()) || (id_found != id_list.cend()) )
+    size_t count = std::count(id_list.begin(), id_list.end(), ret);
+    if( (ret > this->idEnd()) || (count > 1))
     {
         HMI_NOTICE("id %d is not available then generate new id", ret);
         ret = 0; // reset