From c66d20973b9df653847089199b303f427ff6d8fd Mon Sep 17 00:00:00 2001 From: lampehe-local Date: Mon, 28 Jun 2010 09:08:38 +0300 Subject: [PATCH] Fixed bug that caused crash when user tries to expand friend item's text field after canceling locationUpdateDialog. Reviewed by: Jussi Laitinen --- src/situareservice/situareservice.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp index 0b87bfa..4565ba0 100644 --- a/src/situareservice/situareservice.cpp +++ b/src/situareservice/situareservice.cpp @@ -297,13 +297,6 @@ void SituareService::parseUserData(const QByteArray &jsonReply) m_visited = 0; m_nbrOfImages = 0; m_defaultImage = false; - qDeleteAll(m_friendsList.begin(), m_friendsList.end()); - m_friendsList.clear(); - - if(m_user) { - delete m_user; - m_user = 0; - } QJson::Parser parser; bool ok; @@ -320,6 +313,14 @@ void SituareService::parseUserData(const QByteArray &jsonReply) return; } else if(result.contains("user")) { + qDeleteAll(m_friendsList.begin(), m_friendsList.end()); + m_friendsList.clear(); + + if(m_user) { + delete m_user; + m_user = 0; + } + QVariant userVariant = result.value("user"); QMap userMap = userVariant.toMap(); -- 1.7.9.5