From fdd226a5101ab4d7a140fde3e6131de2f6dc0639 Mon Sep 17 00:00:00 2001
From: sniperbeamer <sniperbeamer@b624d157-de02-0410-bad0-e51aec6abb33>
Date: Tue, 2 Mar 2010 22:10:00 +0000
Subject: [PATCH] Fix: Icons could be shown multiple times in Group dialog

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@374 b624d157-de02-0410-bad0-e51aec6abb33
---
 src/dialogs/EditGroupDlg.cpp | 17 +++++++----------
 src/dialogs/EditGroupDlg.h   |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/dialogs/EditGroupDlg.cpp b/src/dialogs/EditGroupDlg.cpp
index 31f0c0e..8504a35 100644
--- a/src/dialogs/EditGroupDlg.cpp
+++ b/src/dialogs/EditGroupDlg.cpp
@@ -50,21 +50,18 @@ CEditGroupDialog::CEditGroupDialog(IDatabase* database,CGroup* Group,QWidget* pa
 	connect( ButtonBox, SIGNAL( accepted() ), this, SLOT( OnOK() ) );
 	connect( ButtonBox, SIGNAL( rejected() ), this, SLOT( OnCancel() ) );
 	connect( Button_Icon, SIGNAL( clicked() ), this, SLOT( OnIconDlg() ));
+	
+	EditTitle->setText(group->Title);
+	
+	for(int i=0;i<db->numIcons();i++){
+		ComboIconPicker->insertItem(i,db->icon(i),"");
+	}
+	ComboIconPicker->setCurrentIndex(group->Image);
 }
 
 CEditGroupDialog::~CEditGroupDialog(){
 }
 
-void CEditGroupDialog::showEvent(QShowEvent *event){
-	if(event->spontaneous()==false){
-		EditTitle->setText(group->Title);
-		for(int i=0;i<db->numIcons();i++){
-			ComboIconPicker->insertItem(i,db->icon(i),"");
-		}
-		ComboIconPicker->setCurrentIndex(group->Image);
-	}
-}
-
 void CEditGroupDialog::OnOK()
 {
 	int r=1;
diff --git a/src/dialogs/EditGroupDlg.h b/src/dialogs/EditGroupDlg.h
index d0942bf..ee0247e 100644
--- a/src/dialogs/EditGroupDlg.h
+++ b/src/dialogs/EditGroupDlg.h
@@ -30,7 +30,7 @@ class CEditGroupDialog : public QDialog, private Ui_EditGroupDialog
 		CEditGroupDialog(IDatabase*,IGroupHandle*,QWidget* parent = 0,  Qt::WFlags fl = 0 );
 		CEditGroupDialog(IDatabase*,CGroup*,QWidget* parent = 0, Qt::WFlags fl = 0 );
 		~CEditGroupDialog();
-		virtual void showEvent(QShowEvent *event);
+	
 	private:
 		IDatabase* db;
 		IGroupHandle* handle;