Merge pull request #954 from ModOrganizer2/Develop

Stage for release 2.2.2

1 files changed, 10 insertions, 4 deletions

diff --git a/src/profilesdialog.cpp b/src/profilesdialog.cpp
index f9ea655f..c91f48f4 100644
--- a/src/profilesdialog.cpp
+++ b/src/profilesdialog.cpp
@@ -57,7 +57,7 @@ ProfilesDialog::ProfilesDialog(const QString &profileName, MOBase::IPluginGame c
 {

   ui->setupUi(this);

 

-  QDir profilesDir(Settings::instance().getProfileDirectory());

+  QDir profilesDir(Settings::instance().paths().profiles());

   profilesDir.setFilter(QDir::AllDirs | QDir::NoDotAndDotDot);

 

   QDirIterator profileIter(profilesDir);

@@ -84,6 +84,12 @@ ProfilesDialog::~ProfilesDialog()
   delete ui;

 }

 

+int ProfilesDialog::exec()

+{

+  GeometrySaver gs(Settings::instance(), this);

+  return QDialog::exec();

+}

+

 void ProfilesDialog::showEvent(QShowEvent *event)

 {

   TutorableDialog::showEvent(event);

@@ -197,7 +203,7 @@ void ProfilesDialog::on_removeProfileButton_clicked()
   if (confirmBox.exec() == QMessageBox::Yes) {

     QString profilePath;

     if (profileToDelete.get() == nullptr) {

-      profilePath = Settings::instance().getProfileDirectory()

+      profilePath = Settings::instance().paths().profiles()

                   + "/" + ui->profilesList->currentItem()->text();

       if (QMessageBox::question(this, tr("Profile broken"),

             tr("This profile you're about to delete seems to be broken or the path is invalid. "

@@ -214,9 +220,9 @@ void ProfilesDialog::on_removeProfileButton_clicked()
       delete item;

     }

     if (!shellDelete(QStringList(profilePath))) {

-      qWarning("Failed to shell-delete \"%s\" (errorcode %lu), trying regular delete", qUtf8Printable(profilePath), ::GetLastError());

+      log::warn("Failed to shell-delete \"{}\" (errorcode {}), trying regular delete", profilePath, ::GetLastError());

       if (!removeDir(profilePath)) {

-        qWarning("regular delete failed too");

+        log::warn("regular delete failed too");

       }

     }

   }