summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBai Jing <jing.t.bai@nokia.com>2012-05-23 18:03:46 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-24 14:27:31 +0200
commitac21426706fe80faf83dbcc9c7d766852e3d9816 (patch)
tree01b6aa40757df23264a429523422b9750557aa36 /tools
parentce926826c65053b6509fed16412646db5e1046bc (diff)
add a missing popRequest to let jsondb-client quit properly
fix a problem when jsondb-client doesn't quit after failing to query with the query passed as command line parameter. Change-Id: I1cb0a982509b9b310a809af75fc88bc0c7de57a1 Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/jsondb-client/client.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/jsondb-client/client.cpp b/tools/jsondb-client/client.cpp
index 0f37c61..1e5e55d 100644
--- a/tools/jsondb-client/client.cpp
+++ b/tools/jsondb-client/client.cpp
@@ -168,7 +168,6 @@ void InputThread::run()
history(hist, &ev, H_LOAD, historyFile.toLocal8Bit().constData());
el_set(el, EL_HIST, history, hist);
el_set(el, EL_BIND, "\t", "tab-key", NULL);
-
while (true) {
line = el_gets(el, &count);
@@ -494,6 +493,8 @@ bool Client::processCommand(const QString &command)
connect(request, SIGNAL(finished()), this, SLOT(popRequest()));
}
connect(request, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)),
+ this, SLOT(popRequest()));
+ connect(request, SIGNAL(error(QtJsonDb::QJsonDbRequest::ErrorCode,QString)),
this, SLOT(onRequestError(QtJsonDb::QJsonDbRequest::ErrorCode,QString)));
pushRequest(request);
mConnection->send(request);