From 342c4fb1d18108042365dd5fa64c5ff8d148fb5c Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 3 Oct 2016 17:18:48 +0200 Subject: [PATCH] Changed: Minor changes --- .../client/ryzom_installer/src/mainwindow.cpp | 14 ++++++++------ .../client/ryzom_installer/src/operationdialog.cpp | 9 ++------- .../tools/client/ryzom_installer/src/utils.cpp | 3 --- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp index 04c665197..822570fec 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/mainwindow.cpp @@ -245,13 +245,15 @@ void CMainWindow::onUninstall() components = dialog.getSelectedCompenents(); } - COperationDialog dialog; - - dialog.setOperation(OperationUninstall); - dialog.setUninstallComponents(components); - - if (dialog.exec()) { + COperationDialog dialog(this); + + dialog.setOperation(OperationUninstall); + dialog.setUninstallComponents(components); + + if (dialog.exec()) + { + } } } diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index d61d3f8af..ccb560ca2 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -771,14 +771,9 @@ void COperationDialog::copyInstaller() // create menu directory if defined QString path = config->getMenuDirectory(); - if (!path.isEmpty()) + if (!path.isEmpty() && !QDir().mkpath(path)) { - QDir dir; - - if (!dir.mkpath(path)) - { - qDebug() << "Unable to create directory" << path; - } + qDebug() << "Unable to create directory" << path; } // create installer link in menu diff --git a/code/ryzom/tools/client/ryzom_installer/src/utils.cpp b/code/ryzom/tools/client/ryzom_installer/src/utils.cpp index a35210588..6c61e0f8f 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/utils.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/utils.cpp @@ -229,9 +229,6 @@ bool resolveShortcut(const QWidget &window, const QString &shortcut, QString &pa // Handle success path = QDir::fromNativeSeparators(qFromWide(szGotPath)); } - else - { - } } } }