From 2955d01eb0268b78acf066093c0eb69fe1f769a0 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 14 Jun 2016 19:54:51 +0200 Subject: [PATCH] Changed: Specify server to process --- .../tools/client/ryzom_installer/src/operationdialog.cpp | 8 +++----- .../tools/client/ryzom_installer/src/operationdialog.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index 61ada6074..9e06cef1c 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -421,8 +421,7 @@ void COperationDialog::downloadData() { CConfigFile *config = CConfigFile::getInstance(); - // default server - const CServer &server = config->getServer(); + const CServer &server = config->getServer(m_currentServerId); m_currentOperation = QApplication::tr("Download data required by server %1").arg(server.name); m_currentOperationProgressFormat = QApplication::tr("Downloading %1..."); @@ -439,8 +438,7 @@ void COperationDialog::downloadClient() { CConfigFile *config = CConfigFile::getInstance(); - // default server - const CServer &server = config->getServer(); + const CServer &server = config->getServer(m_currentServerId); m_currentOperation = QApplication::tr("Download client required by server %1").arg(server.name); m_currentOperationProgressFormat = QApplication::tr("Downloading %1..."); @@ -476,7 +474,7 @@ void COperationDialog::copyDataFiles() CConfigFile *config = CConfigFile::getInstance(); // default server - const CServer &server = config->getServer(); + const CServer &server = config->getServer(m_currentServerId); m_currentOperation = QApplication::tr("Copy data files required by server %1").arg(server.name); m_currentOperationProgressFormat = QApplication::tr("Copying %1..."); diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h index 8e41c5034..b1a42cbb9 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h @@ -126,6 +126,7 @@ protected: OperationType m_operation; SUninstallComponents m_components; + QString m_currentServerId; }; #endif