Imported Upstream version 3.1.1+dfsg1upstream/3.1.1+dfsg1

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));