Merge remote-tracking branch 'upstream/master' into scaling

2020-03-07 10:46:09 +00:00
parent 2770e1769c d4bb9038c5
commit 8ff8e8ac48
24 changed files with 412 additions and 94 deletions
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@ -101,8 +101,14 @@ static void
 settings_get_layout(GSettings *settings, char **type, char **layout)
 {
    GVariant *inputs = g_settings_get_value(settings, "sources");
-    // current layout is always first
-    g_variant_get_child(inputs, 0, "(ss)", type, layout);
+    if (g_variant_n_children(inputs) == 0) {
+        g_warning("No system layout present");
+        *type = NULL;
+        *layout = NULL;
+    } else {
+        // current layout is always first
+        g_variant_get_child(inputs, 0, "(ss)", type, layout);
+    }
    g_variant_unref(inputs);
 }