Reordered the setup flow pages to allow updating the tool without hav…

…ing Steam open. Closes #291.
PazerOP · Mar 6, 2021 · e3d9151 · e3d9151
1 parent cbc5794
commit e3d9151
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/submodules/mh_stuff b/submodules/mh_stuff
diff --git a/tf2_bot_detector/SetupFlow/ISetupFlowPage.h b/tf2_bot_detector/SetupFlow/ISetupFlowPage.h
@@ -13,10 +13,10 @@ namespace tf2_bot_detector
 		Invalid = -1,
 
 		PermissionsCheck = 0,
-		CheckSteamOpen,
-		BasicSettings,
 		NetworkSettings,
 		UpdateCheck,
+		CheckSteamOpen,
+		BasicSettings,
 		AddonManager,
 		ChatWrappersGenerate,
 		TF2CommandLine,

diff --git a/tf2_bot_detector/SetupFlow/NetworkSettingsPage.cpp b/tf2_bot_detector/SetupFlow/NetworkSettingsPage.cpp
@@ -12,7 +12,7 @@ using namespace tf2_bot_detector;
 template<typename T>
 static bool InternalValidateSettings(const T& settings)
 {
-	if (!settings.m_AllowInternetUsage)
+	if (!settings.m_AllowInternetUsage.has_value())
 		return false;
 	if (!settings.m_ReleaseChannel.has_value())
 		return false;

diff --git a/tf2_bot_detector/SetupFlow/SetupFlow.cpp b/tf2_bot_detector/SetupFlow/SetupFlow.cpp
@@ -11,6 +11,7 @@
 #include "Version.h"
 
 #include <imgui.h>
+#include <mh/algorithm/algorithm.hpp>
 #include <mh/text/string_insertion.hpp>
 
 #include <string_view>
@@ -30,6 +31,7 @@ namespace tf2_bot_detector
 
 SetupFlow::SetupFlow()
 {
+	// order unimportant, see SetupFlowPage enum
 	m_Pages.push_back(CreatePermissionsCheckPage());
 	m_Pages.push_back(CreateCheckSteamOpenPage());
 	m_Pages.push_back(std::make_unique<BasicSettingsPage>());
@@ -39,7 +41,13 @@ SetupFlow::SetupFlow()
 	m_Pages.push_back(std::make_unique<ChatWrappersGeneratorPage>());
 	m_Pages.push_back(std::make_unique<TF2CommandLinePage>());
 	m_Pages.push_back(std::make_unique<ChatWrappersVerifyPage>());
-	//m_Pages.push_back(std::make_unique<RCONConnectionPage>());
+	// order unimportant, see SetupFlowPage enum
+
+	mh::sort(m_Pages, [](const std::unique_ptr<ISetupFlowPage>& lhs, const std::unique_ptr<ISetupFlowPage>& rhs)
+		{
+			assert(lhs->GetPage() != rhs->GetPage());
+			return lhs->GetPage() < rhs->GetPage();
+		});
 }
 
 bool SetupFlow::OnUpdate(const Settings& settings)