From c2046bd19a0a89815fd3055edd46852bb0b3571a Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Tue, 21 Jul 2015 11:36:49 +0200
Subject: [PATCH] Initialize correctly the default keymap

If keymaps are activated and there is a secondary keymap but no
primary one, then the pointer to the active keymap was 0x0. This can't
be good.

Fixes bug #9685.
---
 src/Trans.cpp | 2 +-
 status.21x    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Trans.cpp b/src/Trans.cpp
index 1f2b3a8802..d4d41109ca 100644
--- a/src/Trans.cpp
+++ b/src/Trans.cpp
@@ -580,7 +580,7 @@ Trans TransManager::default_;
 
 
 TransManager::TransManager()
-	: active_(0)
+	: active_(&default_)
 {}
 
 
diff --git a/status.21x b/status.21x
index 38387e4f9d..8e5e09fd02 100644
--- a/status.21x
+++ b/status.21x
@@ -255,6 +255,8 @@ What's new
 
 - Fix shortcut conflicts (bug 9567).
 
+- Fix crash when using a secondary keymap but no primary one (bug 9685).
+
 
 * INTERNALS