From 61f313e05c2c7abb78c9dbde6203734394c77fa0 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 26 Aug 2008 16:18:21 +0000 Subject: upported fix for #216 git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2300 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/reguser/wizard.cpp | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'src/modules/reguser/wizard.cpp') diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index 7e23d41ba..49fd9bd72 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -323,24 +323,30 @@ void KviRegistrationWizard::accept() return; } + KviIrcMask * mk; QString m1 = m_pNicknameEdit1->text(); QString m2 = m_pUsernameEdit1->text(); QString m3 = m_pHostEdit1->text(); - KviIrcMask * mk = new KviIrcMask(m1,m2,m3); - m_pDb->removeMask(*mk); - m_pDb->addMask(u,mk); - + if(!(m1.isEmpty() && m2.isEmpty() && m3.isEmpty())) + { + mk = new KviIrcMask(m1,m2,m3); + m_pDb->removeMask(*mk); + m_pDb->addMask(u,mk); + } m1 = m_pNicknameEdit2->text(); m2 = m_pUsernameEdit2->text(); - if(m2.isEmpty())m2 = "*"; - if(m3.isEmpty())m3 = "*"; m3 = m_pHostEdit2->text(); - mk = new KviIrcMask(m1,m2,m3); - - m_pDb->removeMask(*mk); - m_pDb->addMask(u,mk); - + if(!(m1.isEmpty() && m2.isEmpty() && m3.isEmpty())) + { + if(m1.isEmpty())m1 = "*"; + if(m2.isEmpty())m2 = "*"; + if(m3.isEmpty())m3 = "*"; + mk = new KviIrcMask(m1,m2,m3); + m_pDb->removeMask(*mk); + m_pDb->addMask(u,mk); + } + m_pAvatarSelector->commit(); bool bSetAvatar = false; -- cgit v1.3.1-10-gc9f91