only default sort file trees if no setting was saved

2 files changed, 7 insertions, 4 deletions

diff --git a/src/modinfodialogfiletree.cpp b/src/modinfodialogfiletree.cpp
index ca007c1c..79ed4cba 100644
--- a/src/modinfodialogfiletree.cpp
+++ b/src/modinfodialogfiletree.cpp
@@ -21,7 +21,6 @@ FileTreeTab::FileTreeTab(ModInfoDialogTabContext cx)
   m_fs->setReadOnly(false);
   ui->filetree->setModel(m_fs);
   ui->filetree->setColumnWidth(0, 300);
-  ui->filetree->sortByColumn(0, Qt::AscendingOrder);
 
   m_actions.newFolder = new QAction(tr("&New Folder"), ui->filetree);
   m_actions.open = new QAction(tr("&Open/Execute"), ui->filetree);
@@ -63,7 +62,9 @@ void FileTreeTab::saveState(Settings& s)
 
 void FileTreeTab::restoreState(const Settings& s)
 {
-  s.geometry().restoreState(ui->filetree->header());
+  if (!s.geometry().restoreState(ui->filetree->header())) {
+    ui->filetree->sortByColumn(0, Qt::AscendingOrder);
+  }
 }
 
 void FileTreeTab::update()
diff --git a/src/overwriteinfodialog.cpp b/src/overwriteinfodialog.cpp
index b2f2f1f9..ab726fb3 100644
--- a/src/overwriteinfodialog.cpp
+++ b/src/overwriteinfodialog.cpp
@@ -85,7 +85,6 @@ OverwriteInfoDialog::OverwriteInfoDialog(ModInfo::Ptr modInfo, QWidget *parent)
   ui->filesView->setModel(m_FileSystemModel);

   ui->filesView->setRootIndex(m_FileSystemModel->index(modInfo->absolutePath()));

   ui->filesView->setColumnWidth(0, 250);

-  ui->filesView->sortByColumn(0, Qt::AscendingOrder);

 

   m_DeleteAction = new QAction(tr("&Delete"), ui->filesView);

   m_RenameAction = new QAction(tr("&Rename"), ui->filesView);

@@ -110,7 +109,10 @@ void OverwriteInfoDialog::showEvent(QShowEvent* e)
   const auto& s = Settings::instance();

 

   s.geometry().restoreGeometry(this);

-  s.geometry().restoreState(ui->filesView->header());

+

+  if (!s.geometry().restoreState(ui->filesView->header())) {

+    ui->filesView->sortByColumn(0, Qt::AscendingOrder);

+  }

 

   QDialog::showEvent(e);

 }