From f0dd3f431a844983a71bef1bbe69be11f6fe0a9f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 4 Dec 2013 16:57:49 +0100
Subject: fix "forgiving" primary group when (un)selecting secondary groups
 (mga#11864)

---
 NEWS      | 1 +
 userdrake | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 1866548..e0f77be 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- fix "forgiving" primary group when (un)selecting secondary groups (mga#11864)
 - ignore events who lack ->x & ->y
   (thus fixing a crash if clicking too often)
 
diff --git a/userdrake b/userdrake
index 0d482b0..b40daa8 100755
--- a/userdrake
+++ b/userdrake
@@ -1214,8 +1214,9 @@ sub Edit() {
                             } else {
                                 InArray($item, \@primgroup) and  @primgroup = RemoveFromArray($item, \@primgroup);
                             }
+                            my $old = $us->{o}{primgroup}->entry->get_text;
                             $us->{o}{primgroup}->set_popdown_strings(@primgroup);
-                            $Gent and $us->{o}{primgroup}->entry->set_text($Gent->GroupName($GetValue));
+                            $us->{o}{primgroup}->entry->set_text($old);
                         }
                     }
                 } 
@@ -1237,8 +1238,9 @@ sub Edit() {
                     } else {
                         InArray($item, \@primgroup) and  @primgroup = RemoveFromArray($item, \@primgroup);
                     }
+                    my $old = $us->{o}{primgroup}->entry->get_text;
                     $us->{o}{primgroup}->set_popdown_strings(@primgroup);
-                    $Gent and $us->{o}{primgroup}->entry->set_text($Gent->GroupName($GetValue));
+                    $us->{o}{primgroup}->entry->set_text($old);
                 }
             }
             0;
-- 
cgit v1.2.1