summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2018-09-13 01:40:58 +0000
committerMatthias Clasen <mclasen@redhat.com>2018-09-13 01:40:58 +0000
commitf393d371e56c7c2ef5261396b2f690b7e9886aeb (patch)
treec4b385a2f5f992a8de27444c228b400a1fac564d
parent7d1d5119de3b633e9e86cdfe5a65ca5fc3a0c0a6 (diff)
parent88dc784256289820fac148fc5c23d0ad92419881 (diff)
downloadgtk+-f393d371e56c7c2ef5261396b2f690b7e9886aeb.tar.gz
Merge branch 'wip/carlosg/issue-1317' into 'gtk-3-24'
modules: Check current context before retrieving surrounding See merge request GNOME/gtk!326
-rw-r--r--modules/input/imwayland.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/input/imwayland.c b/modules/input/imwayland.c
index 25144f314c..7a9a604126 100644
--- a/modules/input/imwayland.c
+++ b/modules/input/imwayland.c
@@ -121,6 +121,9 @@ notify_external_change (GtkIMContextWayland *context)
{
gboolean result;
+ if (!global->current)
+ return;
+
context->surrounding_change = ZWP_TEXT_INPUT_V3_CHANGE_CAUSE_OTHER;
g_signal_emit_by_name (global->current, "retrieve-surrounding", &result);
}