1 files changed, 18 insertions, 7 deletions

diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 7541f0b..9f611da 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -316,2 +316,17 @@ void SettingsImpl :: changeServerDetails()
         QString newName = servername->text();
+        
+        // Convert any spaces to underscores
+        char *tmpStr = new char[newName.length() + 1];
+        for ( unsigned int i = 0 ; i < newName.length() ; ++i )
+        {
+                if ( newName[i] == ' ' )
+                        tmpStr[i] = '_';
+                else
+                        tmpStr[i] = newName[i].latin1();
+        }
+        tmpStr[newName.length()] = '\0';
+        
+        newName = tmpStr;
+        delete tmpStr;
+        
         if ( !newserver )
@@ -330,10 +345,6 @@ void SettingsImpl :: changeServerDetails()
                         s->setServerName( newName );
-
-                        // See if this server is the active server
-        //              if ( dataMgr->getActiveServer() == serverName )
-        //                      dataMgr->setActiveServer( newName );
-
-                        // Update list box
-                        servers->changeItem( newName, currentSelectedServer );
                 }
+                
+                // Update list box
+                servers->changeItem( newName, currentSelectedServer );
         }