fix button groups

1 files changed, 8 insertions, 5 deletions

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index c299f48faef5..d455526a9bf9 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2312,14 +2312,17 @@ void RadioButton::group(RadioButton &rOther)
     }
 
     if (rOther.m_xGroup)
-    {
-        for (std::set<RadioButton*>::iterator aI = rOther.m_xGroup->begin(), aEnd = rOther.m_xGroup->end(); aI != aEnd; ++aI)
-            m_xGroup->insert(*aI);
-    }
+        m_xGroup->insert(rOther.m_xGroup->begin(), rOther.m_xGroup->end());
 
     m_xGroup->insert(&rOther);
 
-    rOther.m_xGroup = m_xGroup;
+    //make all members of the group share the same button group
+    for (std::set<RadioButton*>::iterator aI = m_xGroup->begin(), aEnd = m_xGroup->end();
+        aI != aEnd; ++aI)
+    {
+        RadioButton* pButton = *aI;
+        pButton->m_xGroup = m_xGroup;
+    }
 
     //if this one is checked, uncheck all the others
     if (mbChecked)