[PC-BSD Commits] r6154 - pcbsd/trunk/SysInstaller

[svn at pcbsd.org]

Author: kris
Date: 2010-02-02 07:55:59 -0800 (Tue, 02 Feb 2010)
New Revision: 6154

Modified:
   pcbsd/trunk/SysInstaller/dialogSelectNet.cpp
Log:

Updated sysinstaller to replace "//" in url's with "/" so we don't fail needlessly



Modified: pcbsd/trunk/SysInstaller/dialogSelectNet.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/dialogSelectNet.cpp	2010-02-02 15:44:04 UTC (rev 6153)
+++ pcbsd/trunk/SysInstaller/dialogSelectNet.cpp	2010-02-02 15:55:59 UTC (rev 6154)
@@ -165,7 +165,7 @@
 // Emit our signal
 void dialogSelectNetServer::saveSlot()
 {
-  QString tmp;
+  QString tmp, server, directory, prefix;
 
   if ( radioInternet->isChecked() )
   {
@@ -180,16 +180,22 @@
 
     if ( comboProto->currentText() == "FTP" )
     {
-       tmp="ftp://";
+       prefix="ftp://";
     } 
 
     if ( comboProto->currentText() == "HTTP" )
     {
-       tmp="http://";
+       prefix="http://";
     }
 
-    tmp = tmp + lineServer->text() + "/" + lineDirectory->text();
+    server = lineServer->text();
+    directory = lineDirectory->text();
+    tmp = server + "/" + directory;
+    tmp.replace(QRegExp("//"), "/");
 
+     
+    tmp = prefix + tmp;
+
     emit saved(tmp);
   }