summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormerttumer <mert.tumer@collabora.com>2021-04-29 06:20:56 +0000
committerMert Tumer <mert.tumer@collabora.com>2021-05-03 06:54:15 +0200
commita632d90b3e17c7efb9b9f712758896e8d8fdf2ea (patch)
treeef1c4fb402086f80a288863a99a0b1799716bb90
parent661e6b9a993e262f96e2d2b02ed356017c1fa436 (diff)
Wait for dialog response on Android
Do not return RET_OK immediately. Change-Id: I1ff22edce54e4717e418457bde1dca830346f197 Signed-off-by: merttumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114831 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
-rw-r--r--vcl/source/window/dialog.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index bf6bf188f14c..df02e19654bc 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -18,6 +18,7 @@
*/
#include <config_feature_desktop.h>
+#include <config_features.h>
#ifdef IOS
#include <premac.h>
@@ -1037,7 +1038,7 @@ short Dialog::Execute()
// Once the Android app is based on same idea as the iOS one currently
// being developed, no conditional should be needed here. Until then,
// play it safe.
-#if HAVE_FEATURE_DESKTOP || defined IOS
+#if HAVE_FEATURE_DESKTOP || defined IOS || HAVE_FEATURE_ANDROID_LOK
VclPtr<vcl::Window> xWindow = this;
mbInSyncExecute = true;