From 55c094dda96c45df53b347b52eddfa01adeed33e Mon Sep 17 00:00:00 2001 From: DavidXanatos <3890945+DavidXanatos@users.noreply.github.com> Date: Sat, 13 Apr 2024 19:12:40 +0200 Subject: [PATCH] fix [skipci] --- CHANGELOG.md | 2 ++ SandboxiePlus/SandMan/Windows/SettingsWindow.cpp | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f06a4172..2857bbec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - fixed When I change the BlockDNS and BlockPorts options, the Apply button is not activated [#3807](https://github.com/sandboxie-plus/Sandboxie/issues/3807) - fixed troubleshooting wizard broke with new qt [#3810](https://github.com/sandboxie-plus/Sandboxie/discussions/3810) +- fixed Settings dialog now showing the right ram disk letter + ## [1.13.5 / 5.68.5] - 2024-04-10 diff --git a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp index 6469f177..0e75cb82 100644 --- a/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp +++ b/SandboxiePlus/SandMan/Windows/SettingsWindow.cpp @@ -277,6 +277,12 @@ CSettingsWindow::CSettingsWindow(QWidget* parent) m_HoldChange = false; + DWORD logical_drives = GetLogicalDrives(); + for (CHAR search = 'D'; search <= 'Z'; search++) { + if ((logical_drives & (1 << (search - 'A'))) == 0) + ui.cmbRamLetter->addItem(QString("%1:\\").arg(QChar(search))); + } + CPathEdit* pEditor = new CPathEdit(); ui.txtEditor->parentWidget()->layout()->replaceWidget(ui.txtEditor, pEditor); ui.txtEditor->deleteLater(); @@ -399,11 +405,6 @@ CSettingsWindow::CSettingsWindow(QWidget* parent) connect(ui.txtRamLimit, SIGNAL(textChanged(const QString&)), this, SLOT(OnRamDiskChange())); connect(ui.chkRamLetter, SIGNAL(stateChanged(int)), this, SLOT(OnRamDiskChange())); connect(ui.cmbRamLetter, SIGNAL(currentIndexChanged(int)), this, SLOT(OnGeneralChanged())); - DWORD logical_drives = GetLogicalDrives(); - for (CHAR search = 'D'; search <= 'Z'; search++) { - if ((logical_drives & (1 << (search - 'A'))) == 0) - ui.cmbRamLetter->addItem(QString("%1:\\").arg(QChar(search))); - } // // Advanced Config @@ -988,7 +989,7 @@ void CSettingsWindow::LoadSettings() if(uDiskLimit > 0) ui.txtRamLimit->setText(QString::number(uDiskLimit)); QString RamLetter = theAPI->GetGlobalSettings()->GetText("RamDiskLetter"); ui.chkRamLetter->setChecked(!RamLetter.isEmpty()); - ui.cmbRamLetter->setCurrentText(RamLetter); + ui.cmbRamLetter->setCurrentIndex(ui.cmbRamLetter->findText(RamLetter)); m_HoldChange = true; OnRamDiskChange(); m_HoldChange = false;