v2.17.5

Author: bernerdad

client/base/backend/preferences/preferences.cpp

@@ -985,6 +985,7 @@ void Preferences::validateAndUpdateIfNeeded()
         if (!bCorrect)
         {
             cdi.type = CONNECTED_DNS_TYPE_AUTO;
+            cdi.isSplitDns = false;
             engineSettings_.setConnectedDnsInfo(cdi);
             emit connectedDnsInfoChanged(engineSettings_.connectedDnsInfo());
             is_update_needed = true;

client/common/changelog.txt

@@ -1,3 +1,13 @@
+2.17.5 (15/09/2025)
+All:
+   * Fixed incorrect scroll position in preferences. #1465
+   * Fixed custom DNS preferences behaviour. #1470
+Windows:
+   * Fixed playing a sound may capture the audio device, preventing Windows from sleeping. #1410
+MacOS:
+   * Fixed regression in the in-app updater for macOS. #1471
+
+
 2.17.4 (04/09/2025)
 All:
    * Improved highlight colours used in log viewer. #1213

client/common/version/windscribe_version.h

@@ -2,11 +2,11 @@
 
 #define WINDSCRIBE_MAJOR_VERSION 2
 #define WINDSCRIBE_MINOR_VERSION 17
-#define WINDSCRIBE_BUILD_VERSION 4
+#define WINDSCRIBE_BUILD_VERSION 5
 
 // only one of these should be enabled; neither -> stable
-//#define WINDSCRIBE_IS_BETA
-#define WINDSCRIBE_IS_GUINEA_PIG
+#define WINDSCRIBE_IS_BETA
+//#define WINDSCRIBE_IS_GUINEA_PIG
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)

client/gui/mainwindow.cpp

@@ -1386,7 +1386,10 @@ void MainWindow::onPreferencesReportErrorToUser(const QString &title, const QStr
 
 void MainWindow::onPreferencesCollapsed()
 {
-    backend_->getPreferences()->validateAndUpdateIfNeeded();
+    // Suppress validation if we're showing an alert; we should return to preferences after
+    if (mainWindowController_->currentWindow() != MainWindowController::WINDOW_ID_GENERAL_MESSAGE) {
+        backend_->getPreferences()->validateAndUpdateIfNeeded();
+    }
 }
 
 #if defined(Q_OS_LINUX)

client/gui/mainwindowcontroller.cpp

@@ -3303,13 +3303,6 @@ void MainWindowController::onAppSkinChanged(APP_SKIN s)
                                                   preferencesWindow_->boundingRect().height() - childWindowShadowOffsetY(false)));
         invalidateShadow_mac();
         keepWindowInsideScreenCoordinates();
-
-        int scrollOffset = 2*UPDATE_WIDGET_HEIGHT;
-        if (s != APP_SKIN_VAN_GOGH && !updateAppItem_->isVisible()) {
-            scrollOffset = 0;
-        }
-        preferencesWindow_->setScrollOffset(scrollOffset);
-        windowSizeManager_->setScrollPos(preferencesWindow_, scrollOffset);
     }
 
     // update window heights

client/gui/preferenceswindow/connectionwindow/connecteddnsgroup.cpp

@@ -28,6 +28,7 @@ ConnectedDnsGroup::ConnectedDnsGroup(ScalableGraphicsObject *parent, const QStri
 
     splitDnsCheckBox_ = new ToggleItem(this);
     splitDnsCheckBox_->setState(false);
+    splitDnsCheckBox_->setEnabled(false);
     connect(splitDnsCheckBox_, &ToggleItem::stateChanged, this, &ConnectedDnsGroup::onSplitDnsStateChanged);
     addItem(splitDnsCheckBox_, true);
 
@@ -69,9 +70,10 @@ void ConnectedDnsGroup::setConnectedDnsInfo(const types::ConnectedDnsInfo &dns)
         else
             comboBoxDns_->setCurrentItem(CONNECTED_DNS_TYPE_CUSTOM);
 
+        splitDnsCheckBox_->setState(dns.isSplitDns);
         editBoxUpstream1_->setText(dns.upStream1);
+        onUpstream1Changed(dns.upStream1);
         editBoxUpstream2_->setText(dns.upStream2);
-        splitDnsCheckBox_->setState(dns.isSplitDns);
         domainsItem_->setLinkText(QString::number(dns.hostnames.count()));
 
         updateMode();
@@ -105,6 +107,12 @@ void ConnectedDnsGroup::onConnectedDnsModeChanged(QVariant v)
 
 void ConnectedDnsGroup::onUpstream1Changed(QString v)
 {
+    if (v.isEmpty()) {
+        splitDnsCheckBox_->setState(false);
+        onSplitDnsStateChanged(false);
+    }
+    splitDnsCheckBox_->setEnabled(!v.isEmpty());
+
     if (settings_.upStream1 != v) {
         checkDnsLeak(v);
         settings_.upStream1 = v;
@@ -129,7 +137,6 @@ void ConnectedDnsGroup::onSplitDnsStateChanged(bool checked)
         if (settings_.isSplitDns && !checked) {
             hideItems(indexOf(editBoxUpstream2_), indexOf(domainsItem_));
         } else  {        // show additional items
-            checkDnsLeak(settings_.upStream2);
             showItems(indexOf(editBoxUpstream1_), indexOf(domainsItem_));
         }
 

client/gui/sounds/soundmanager.cpp

@@ -9,31 +9,11 @@
 SoundManager::SoundManager(QObject *parent, Preferences *preferences)
     : QObject(parent), preferences_(preferences), audioEngineInitialized_(false), soundInitialized_(false), shouldLoop_(false), connectedEventQueued_(false)
 {
-    initialize(); // NOLINT
 }
 
 SoundManager::~SoundManager()
 {
-    cleanup();
-}
-
-void SoundManager::initialize()
-{
-    ma_result result = ma_engine_init(NULL, &audioEngine_);
-    if (result != MA_SUCCESS) {
-        qCDebug(LOG_BASIC) << "Failed to initialize miniaudio engine: " << result;
-        return;
-    }
-    audioEngineInitialized_ = true;
-}
-
-void SoundManager::cleanup()
-{
-    if (audioEngineInitialized_) {
-        cleanupCurrentSoundData();
-        ma_engine_uninit(&audioEngine_);
-        audioEngineInitialized_ = false;
-    }
+    cleanupCurrentSoundData();
 }
 
 void SoundManager::handleQueuedConnectedEvent()
@@ -84,12 +64,16 @@ void SoundManager::stop()
 void SoundManager::playSound(const QString &path, bool loop)
 {
     qCDebug(LOG_BASIC) << "Playing sound" << path;
-    if (!audioEngineInitialized_) {
-        qCDebug(LOG_BASIC) << "Audio engine not initialized";
+
+    cleanupCurrentSoundData();
+
+    ma_result result = ma_engine_init(NULL, &audioEngine_);
+    if (result != MA_SUCCESS) {
+        qCDebug(LOG_BASIC) << "Failed to initialize miniaudio engine: " << result;
         return;
     }
-    cleanupCurrentSoundData();
-    ma_result result;
+    audioEngineInitialized_ = true;
+
     if (path.startsWith(":/sounds")) {     // load from resources
         QFile file(path);
         if (!file.open(QIODevice::ReadOnly)) {
@@ -140,6 +124,7 @@ void SoundManager::playSound(const QString &path, bool loop)
 
 void SoundManager::cleanupCurrentSoundData()
 {
+    qCDebug(LOG_BASIC) << "Cleaning up current sound data";
     if (soundInitialized_) {
         ma_sound_stop(&sound_);
         ma_sound_uninit(&sound_);
@@ -150,6 +135,12 @@ void SoundManager::cleanupCurrentSoundData()
         ma_decoder_uninit(&decoder_);
         decoderInitialized_ = false;
     }
+
+    if (audioEngineInitialized_) {
+        ma_engine_uninit(&audioEngine_);
+        audioEngineInitialized_ = false;
+    }
+
     audioBuffer_.clear();
 }
 

client/gui/sounds/soundmanager.h

@@ -22,8 +22,6 @@ private slots:
 
 private:
     static void endCallback(void* pUserData, ma_sound* pSound);
-    void initialize();
-    void cleanup();
     void playSound(const QString &path, bool loop);
     void cleanupCurrentSoundData();
 

installer/mac/installer/CMakeLists.txt

@@ -43,7 +43,7 @@ add_subdirectory(../../common ${CMAKE_CURRENT_BINARY_DIR}/common)
 
 set_target_properties(installer
                       PROPERTIES
-                      OUTPUT_NAME "WindscribeInstaller"
+                      OUTPUT_NAME "installer"
                       MACOSX_BUNDLE TRUE
                       MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/Info.plist
                       COMPILE_WARNING_AS_ERROR TRUE
@@ -98,3 +98,10 @@ install(TARGETS installer
    LIBRARY DESTINATION "installer.app/Contents/Frameworks"
    BUNDLE DESTINATION .
 )
+
+# Rename bundle after installation
+install(CODE "
+    execute_process(COMMAND ${CMAKE_COMMAND} -E rename
+        \${CMAKE_INSTALL_PREFIX}/installer.app
+        \${CMAKE_INSTALL_PREFIX}/WindscribeInstaller.app)
+")