- set GRP_TOGGLE to '' when no GRP_TOGGLE are used

- defaults to previous GRP_TOGGLE if one is available

1 files changed, 9 insertions, 7 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index cba30c7ee..dc2c5ec8c 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1184,15 +1184,17 @@ sub config_mtools {
 sub keyboard_group_toggle_choose {
     my ($in, $keyboard) = @_;
 
-    my $grp_toggles = keyboard::grp_toggles($keyboard) or return 1;
-
-    my $GRP_TOGGLE = 
-      $in->ask_from_listf('', _("Here you can choose the key or key combination that will 
+    if (my $grp_toggles = keyboard::grp_toggles($keyboard)) {
+	my $GRP_TOGGLE = $keyboard->{GRP_TOGGLE} || 'caps_toggle';
+	$GRP_TOGGLE = $in->ask_from_listf('', _("Here you can choose the key or key combination that will 
 allow switching between the different keyboard layouts
-(eg: latin and non latin)"), sub { $grp_toggles->{$_[0]} }, [ sort keys %$grp_toggles ], 'caps_toggle') or return;
+(eg: latin and non latin)"), sub { $grp_toggles->{$_[0]} }, [ sort keys %$grp_toggles ], $GRP_TOGGLE) or return;
 
-    log::l("GRP_TOGGLE: $GRP_TOGGLE");
-    $keyboard->{GRP_TOGGLE} = $GRP_TOGGLE;
+        log::l("GRP_TOGGLE: $GRP_TOGGLE");
+        $keyboard->{GRP_TOGGLE} = $GRP_TOGGLE;
+    } else {
+        $keyboard->{GRP_TOGGLE} = '';
+    }
     1;
 }