keyboard: Handle case where keyboardMonitor is unset

This may be the case where keyboardIndex is -1, which may be the
case where either the keyboard monitor hasn't been set yet, or
the keyboard is being unmanaged and meta_window_get_monitor
returns -1

https://bugzilla.gnome.org/show_bug.cgi?id=788882
This commit is contained in:
Sam Spilsbury 2017-10-11 12:59:19 +02:00 committed by Marco Trevisan (Treviño)
parent c9bf72c5c4
commit 19e864ed3b

View File

@ -936,9 +936,11 @@ var Keyboard = new Lang.Class({
}, },
_relayout() { _relayout() {
if (this.actor == null)
return;
let monitor = Main.layoutManager.keyboardMonitor; let monitor = Main.layoutManager.keyboardMonitor;
if (this.actor == null || monitor == null)
return;
let maxHeight = monitor.height / 3; let maxHeight = monitor.height / 3;
this.actor.width = monitor.width; this.actor.width = monitor.width;
this.actor.height = maxHeight; this.actor.height = maxHeight;