From 26e01e80be2f1decf54ec80cf7cc51b1dfc93ad9 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sat, 23 Apr 2011 21:02:05 +0000
Subject: [PATCH] bug fix with combo box, add flag to show that server list
 item was chosen

---
 src/connectdlg.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
index 33619d95..7ae1e737 100755
--- a/src/connectdlg.cpp
+++ b/src/connectdlg.cpp
@@ -28,9 +28,10 @@
 /* Implementation *************************************************************/
 CConnectDlg::CConnectDlg ( QWidget* parent, Qt::WindowFlags f )
     : QDialog ( parent, f ),
-      strSelectedAddress  ( "" ),
-      bServerListReceived ( false ),
-      bCancelPressed      ( false )
+      strSelectedAddress       ( "" ),
+      bServerListReceived      ( false ),
+      bCancelPressed           ( false ),
+      bServerListItemWasChosen ( false )
 {
     setupUi ( this );
 
@@ -87,6 +88,7 @@ CConnectDlg::CConnectDlg ( QWidget* parent, Qt::WindowFlags f )
 void CConnectDlg::LoadStoredServers ( const CVector<QString>& vstrIPAddresses )
 {
     // load stored IP addresses in combo box
+    LineEditServerAddr->clear();
     for ( int iLEIdx = 0; iLEIdx < MAX_NUM_SERVER_ADDR_ITEMS; iLEIdx++ )
     {
         if ( !vstrIPAddresses[iLEIdx].isEmpty() )
@@ -100,8 +102,9 @@ void CConnectDlg::showEvent ( QShowEvent* )
 {
     // reset flags (on opening the connect dialg, we always want to request a
     // new updated server list per definition)
-    bServerListReceived = false;
-    bCancelPressed      = false;
+    bServerListReceived      = false;
+    bCancelPressed           = false;
+    bServerListItemWasChosen = false;
 
     // clear current address
     strSelectedAddress = "";
@@ -139,8 +142,12 @@ void CConnectDlg::hideEvent ( QHideEvent* )
 
     if ( CurSelListItemList.count() > 0 )
     {
+        // get host address from selected list view item as a string
         strSelectedAddress =
             CurSelListItemList[0]->data ( 0, Qt::UserRole ).toString();
+
+        // set flag that a server list item was chosen to connect
+        bServerListItemWasChosen = true;
     }
     else
     {