Merge tag 'upstream/3.1.1+dfsg1'

Upstream version 3.1.1+dfsg1

# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg:                using RSA key 5001E1B09AA3744B
# gpg:                issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg:                 aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18  5A5C 5001 E1B0 9AA3 744B

1 files changed, 6 insertions, 0 deletions

diff --git a/Plugins/DbAndroid/dbandroidjsonconnection.cpp b/Plugins/DbAndroid/dbandroidjsonconnection.cpp
index fb8087e..2c0023f 100644
--- a/Plugins/DbAndroid/dbandroidjsonconnection.cpp
+++ b/Plugins/DbAndroid/dbandroidjsonconnection.cpp
@@ -295,6 +295,12 @@ bool DbAndroidJsonConnection::deleteDatabase(const QString& dbName)
 DbAndroidConnection::ExecutionResult DbAndroidJsonConnection::executeQuery(const QString& query)
 {
     DbAndroidConnection::ExecutionResult executionResults;
+    if (!isConnected())
+    {
+        executionResults.wasError = true;
+        executionResults.errorMsg = tr("Unable to execute query on Android device (connection was closed): %1").arg(query);
+        return executionResults;
+    }
 
     QJsonDocument json = wrapQueryInJson(query);
     QByteArray responseBytes = send(json.toJson(QJsonDocument::Compact));