summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormvglasow <michael -at- vonglasow.com>2016-01-26 13:31:10 +0100
committermvglasow <michael -at- vonglasow.com>2016-02-24 16:18:10 +0100
commit466fcb3d48d172d8e5ac340ec8a90d6ae56d47c1 (patch)
tree06c3804192eac60dcd6d23c5e720fde6d5157578
parent631753a67e78853044c1bfba04f4e9bc94d3549c (diff)
downloadnavit-466fcb3d48d172d8e5ac340ec8a90d6ae56d47c1.tar.gz
Fix:gui_internal:Make native keyboard compatible with changes after R6421
Signed-off-by: mvglasow <michael -at- vonglasow.com>
-rw-r--r--navit/gui/internal/gui_internal_keyboard.c6
-rw-r--r--navit/gui/internal/gui_internal_search.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/navit/gui/internal/gui_internal_keyboard.c b/navit/gui/internal/gui_internal_keyboard.c
index 857b0d607..8d85012ad 100644
--- a/navit/gui/internal/gui_internal_keyboard.c
+++ b/navit/gui/internal/gui_internal_keyboard.c
@@ -16,6 +16,9 @@ void
gui_internal_keyboard_to_upper_case(struct gui_priv *this)
{
struct menu_data *md;
+
+ if (!this->keyboard)
+ return;
md=gui_internal_menu_data(this);
// Switch to lowercase after the first key is pressed
if (md->keyboard_mode == 10) // Latin
@@ -30,6 +33,9 @@ void
gui_internal_keyboard_to_lower_case(struct gui_priv *this)
{
struct menu_data *md;
+
+ if (!this->keyboard)
+ return;
md=gui_internal_menu_data(this);
// Switch to lowercase after the first key is pressed
if (md->keyboard_mode == (VKBD_LATIN_UPPER | VKBD_FLAG_2)) // Latin
diff --git a/navit/gui/internal/gui_internal_search.c b/navit/gui/internal/gui_internal_search.c
index 2ebf69190..262559c14 100644
--- a/navit/gui/internal/gui_internal_search.c
+++ b/navit/gui/internal/gui_internal_search.c
@@ -212,6 +212,9 @@ gui_internal_highlight_possible_keys(struct gui_priv *this, char *possible_keys)
{
struct menu_data *md;
+ if (!this->keyboard)
+ return;
+
md=gui_internal_menu_data(this);
if (md && md->keyboard && !(this->flags & 2048)) {
GList *lk=md->keyboard->children;