Fixed bug, again ..

Default-Email Chooser wasn't removed in some rare cases ..

1 files changed, 10 insertions, 9 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 7682399..0b65a10 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -136,8 +136,10 @@ void ContactEditor::init() {
 
 	svGeneral = new QScrollView( tabViewport );
 	vb->addWidget( svGeneral, 0, 0 );
 	svGeneral->setResizePolicy( QScrollView::AutoOneFit );
+	// svGeneral->setHScrollBarMode( QScrollView::AlwaysOff );
+	// svGeneral->setVScrollBarMode( QScrollView::AlwaysOff );
 	svGeneral->setFrameStyle( QFrame::NoFrame );
 
 	QWidget *container = new QWidget( svGeneral->viewport() );
 	svGeneral->addChild( container );
@@ -773,17 +775,16 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 		// Something else was selected: Hide combo..
 		qWarning(" Hiding default-email combo" );
 		if ( defaultEmailChooserPosition == widgetPos ){
 			defaultEmailChooserPosition = -1;
-			QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
-			if ( cmbo ){  
-				inputStack->raiseWidget( TextField );
-				inputStack -> removeWidget( cmbo );
-				cmbDefaultEmail = 0l;
-				delete cmbo;
-			}
-
-		} 
+		}
+		QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
+		if ( cmbo ){  
+			inputStack->raiseWidget( TextField );
+			inputStack -> removeWidget( cmbo );
+			cmbDefaultEmail = 0l;
+			delete cmbo;
+		}
 
 		// Caller should initialize the responsible textfield, therefore
 		// "false" is returned
 		return false;