Fix bug in MsgStoGetAddressByConvId.

diff --git a/utils/MsgUtilStorage.cpp b/utils/MsgUtilStorage.cpp
index 88e457e..72634af 100755 (executable)
--- a/utils/MsgUtilStorage.cpp
+++ b/utils/MsgUtilStorage.cpp
@@ -612,8 +612,7 @@ msg_error_t MsgStoGetAddressByConvId(MsgDbHandler *pDbHandle, msg_thread_id_t co
                pAddr->contactId = pDbHandle->getColumnToInt(index++);
                pDbHandle->getColumnToString(index++, MAX_ADDRESS_VAL_LEN, pAddr->addressVal);
                pDbHandle->getColumnToString(index++, MAX_DISPLAY_NAME_LEN, pAddr->displayName);
-               if(!strlen(pAddr->displayName))
-               {
+               if(!strlen(pAddr->displayName)) {
                        pDbHandle->getColumnToString(index++,MAX_DISPLAY_NAME_LEN, firstName);
                        pDbHandle->getColumnToString(index++,MAX_DISPLAY_NAME_LEN, lastName);
 
@@ -636,6 +635,9 @@ msg_error_t MsgStoGetAddressByConvId(MsgDbHandler *pDbHandle, msg_thread_id_t co
                                        strncat(pAddr->displayName, firstName, MAX_DISPLAY_NAME_LEN-strlen(pAddr->displayName));
                                }
                        }
+               } else {
+                       index++; // firstname
+                       index++; // lastname
                }
 
        }