From b2f70a7802e90eea0d04eef7edc0a52178fda753 Mon Sep 17 00:00:00 2001 From: Thorvald Natvig Date: Fri, 27 Jun 2008 11:25:32 +0000 Subject: [PATCH] Patch 2003574: Cannot save current connection [prosper_spurius] git-svn-id: https://mumble.svn.sourceforge.net/svnroot/mumble/trunk@1186 05730e5d-ab1b-0410-a4ac-84af385074fa --- src/mumble/ConnectDialog.cpp | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp index 816efd50e..cc670d953 100644 --- a/src/mumble/ConnectDialog.cpp +++ b/src/mumble/ConnectDialog.cpp @@ -30,6 +30,7 @@ #include "ConnectDialog.h" #include "Global.h" +#include "ServerHandler.h" TextSortedItem::TextSortedItem(QTreeWidget *p, const QStringList &strings) : QTreeWidgetItem(p, strings) { } @@ -302,14 +303,25 @@ void ConnectDialog::on_qpbAdd_clicked() { return; } } - + qlwServers->setCurrentIndex(QModelIndex()); - + + QString host, user, pw; + int port = 64378; + + if (g.sh && g.sh->isRunning()) { + g.sh->getConnectionInfo(host, port, user, pw); + } + else { + user = g.s.qsUsername; + pw = QString(); + host = QLatin1String("host"); + } qleName->setText(tr("-Unnamed entry-")); - qleServer->setText(QString()); - qleUsername->setText(g.s.qsUsername); - qlePassword->setText(QString()); - qlePort->setText(QLatin1String("64738")); + qleServer->setText(host); + qleUsername->setText(user); + qlePassword->setText(pw); + qlePort->setText(QString::number(port)); qpbAdd->setText(tr("Add")); qpbAdd->setEnabled(false);