From af8973312188c3d90b8e3f8e2f8036d35e3f21ea Mon Sep 17 00:00:00 2001 From: Tannin Date: Mon, 30 Jun 2014 22:37:21 +0200 Subject: - bugfix: update.bsa is again treated like a regular bsa because hiding it from the archive-list made it impossible (in managed bsa mode) to overwrite files from update.bsa - bugfix: disabled-state for mo management wasn't saved - bugfix: when starting an application, settings were saved twice - bugfix: origin ids and handles for directory updates were out of sync --- src/mainwindow.cpp | 11 +++++------ src/version.rc | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 87eca8df..9cbe9c40 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1365,8 +1365,6 @@ HANDLE MainWindow::spawnBinaryDirect(const QFileInfo &binary, const QString &arg void MainWindow::spawnBinary(const QFileInfo &binary, const QString &arguments, const QDir ¤tDirectory, bool closeAfterStart, const QString &steamAppID) { - storeSettings(); - LockedDialog *dialog = new LockedDialog(this); dialog->show(); ON_BLOCK_EXIT([&] () { dialog->hide(); dialog->deleteLater(); }); @@ -1888,10 +1886,6 @@ void MainWindow::refreshBSAList() QString extension = filename.right(3).toLower(); if (extension == "bsa") { - if (filename.compare("update.bsa", Qt::CaseInsensitive) == 0) { - // hack: ignore update.bsa because it confuses people - continue; - } int index = m_ActiveArchives.indexOf(filename); if (index == -1) { index = 0xFFFF; @@ -2074,6 +2068,10 @@ void MainWindow::readSettings() if (settings.value("Settings/use_proxy", false).toBool()) { activateProxy(true); } + + ui->manageArchivesBox->blockSignals(true); + ui->manageArchivesBox->setChecked(settings.value("manage_bsas", true).toBool()); + ui->manageArchivesBox->blockSignals(false); } @@ -2113,6 +2111,7 @@ void MainWindow::storeSettings() settings.setValue("browser_geometry", m_IntegratedBrowser.saveGeometry()); settings.setValue("filters_visible", ui->displayCategoriesBtn->isChecked()); + settings.setValue("manage_bsas", ui->manageArchivesBox->isChecked()); settings.remove("customExecutables"); settings.beginWriteArray("customExecutables"); diff --git a/src/version.rc b/src/version.rc index aa36658e..397fddbe 100644 --- a/src/version.rc +++ b/src/version.rc @@ -1,7 +1,7 @@ #include "Winver.h" -#define VER_FILEVERSION 1,2,7,0 -#define VER_FILEVERSION_STR "1,2,7,0\0" +#define VER_FILEVERSION 1,2,9,0 +#define VER_FILEVERSION_STR "1,2,9,0\0" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION -- cgit v1.3.1