Fix problem with activation when add configs and Bump version

censortracker · Mar 2, 2025 · e938ab2 · e938ab2
1 parent 39f7caa
commit e938ab2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.25)
 
-project(desktopproxy VERSION 0.1.0.7 LANGUAGES CXX)
+project(desktopproxy VERSION 0.1.0.8 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

diff --git a/deploy/installer/config/windows.xml b/deploy/installer/config/windows.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Installer>
     <Name>Censor Tracker Proxy</Name>
-    <Version>0.1.0.7</Version>
+    <Version>0.1.0.8</Version>
     <Title>Censor Tracker Proxy</Title>
     <Publisher>Censor Tracker</Publisher>
     <StartMenuDir>Censor Tracker Proxy</StartMenuDir>

diff --git a/deploy/installer/packages/org.censortracker.proxy/meta/package.xml b/deploy/installer/packages/org.censortracker.proxy/meta/package.xml
@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>Censor Tracker Proxy</DisplayName>
     <Description>Installation package for Censor Tracker Proxy</Description>
-    <Version>0.1.0.7</Version>
+    <Version>0.1.0.8</Version>
     <ReleaseDate>2025-02-18</ReleaseDate>
     <Default>true</Default>
     <Script>installscript.qs</Script>

diff --git a/proxyserver/src/configmanager.cpp b/proxyserver/src/configmanager.cpp
@@ -288,7 +288,7 @@ bool ConfigManager::addConfigs(const QStringList &serializedConfigs)
         return false;
     }
 
-    // If there's no active config, activate the first added one
+    // If there's no active config, activate the first added one    
     if (activeUuid.isEmpty() && !firstUuid.isEmpty())
     {
         Logger::getInstance().info(QString("No active config, activating first added config: %1").arg(firstUuid));
@@ -316,12 +316,25 @@ bool ConfigManager::removeConfig(const QString &uuid)
         .arg(configToRemove["name"].toString())
         .arg(configToRemove["protocol"].toString()));
 
+    // Store current active config UUID
+    bool needToActivateNew = (getActiveConfigUuid() == uuid);
+
+    // Remove config from the list
     configs.remove(uuid);
-
-    // If removing active config, activate another one first   
-    if (getActiveConfigUuid() == uuid)
+
+    // Save updated configs list (without changing activeConfigUuid)
+    configsInfo["configs"] = configs;
+    Logger::getInstance().debug("Writing updated configs info to file");
+    if (!writeConfigsInfo(configsInfo))
+    {
+        Logger::getInstance().error("Failed to write configs info");
+        return false;
+    }
+
+    // If active config was removed, activate a new one
+    if (needToActivateNew)
     {
-        Logger::getInstance().info("Removing active config, need to activate another one");
+        Logger::getInstance().info("Removed active config, need to activate a new one");
         if (configs.isEmpty())
         {
             Logger::getInstance().info("No configs left, clearing active config");
@@ -342,10 +355,8 @@ bool ConfigManager::removeConfig(const QString &uuid)
             }
         }
     }
-
-    configsInfo["configs"] = configs;
-    Logger::getInstance().debug("Writing updated configs info to file");
-    return writeConfigsInfo(configsInfo);
+
+    return true;
 }
 
 bool ConfigManager::activateConfig(const QString &uuid)