From 9744b44b6e19acae8802d1cd66e668549d1e4571 Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 11 Oct 2016 18:04:01 +0200 Subject: [PATCH] Changed: Specify server to use (the one of default profile) --HG-- branch : develop --- code/ryzom/tools/client/ryzom_installer/src/main.cpp | 2 ++ code/ryzom/tools/client/ryzom_installer/src/operationdialog.h | 1 + 2 files changed, 3 insertions(+) diff --git a/code/ryzom/tools/client/ryzom_installer/src/main.cpp b/code/ryzom/tools/client/ryzom_installer/src/main.cpp index 9e4bdf8a0..a4ec462d9 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/main.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/main.cpp @@ -216,6 +216,7 @@ int main(int argc, char *argv[]) COperationDialog dialog; + dialog.setCurrentServerId(config.getProfile().server); dialog.setOperation(OperationUninstall); dialog.setUninstallComponents(components); @@ -244,6 +245,7 @@ int main(int argc, char *argv[]) if (step != Done) { COperationDialog dialog; + dialog.setCurrentServerId(config.getProfile().server); dialog.setOperation(config.getSrcServerDirectory().isEmpty() ? OperationInstall:OperationMigrate); if (!dialog.exec()) return 1; diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h index 037cfb016..50f6d761b 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h @@ -40,6 +40,7 @@ public: void setOperation(OperationType operation); void setUninstallComponents(const SComponents &components); + void setCurrentServerId(const QString &serverId) { m_currentServerId = serverId; } public slots: void onAbortClicked();