From 38c6ea1895ffeecc920115e811f3f314c38d25c0 Mon Sep 17 00:00:00 2001
From: Exzap <13877693+Exzap@users.noreply.github.com>
Date: Sun, 26 Jul 2026 10:41:03 +0200
Subject: [PATCH] Remove mac disclaimer + minor code cleanup

---
 src/Cafe/CafeSystem.cpp            |  1 -
 src/Cafe/OS/libs/nn_nfp/nn_nfp.cpp |  3 ---
 src/config/LaunchSettings.cpp      |  2 +-
 src/gui/wxgui/CemuApp.cpp          | 16 ----------------
 src/gui/wxgui/wxCemuConfig.h       |  2 +-
 5 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/Cafe/CafeSystem.cpp b/src/Cafe/CafeSystem.cpp
index e52b8a7c..69e03a42 100644
--- a/src/Cafe/CafeSystem.cpp
+++ b/src/Cafe/CafeSystem.cpp
@@ -190,7 +190,6 @@ void LoadMainExecutable()
 		currentBaseApplicationHash = generateHashFromRawRPXData(baseRpxData, baseRpxSize);
 	}
 	free(baseRpxData);
-	debug_printf("RPXHash: 0x%08x\n", currentBaseApplicationHash);
 }
 
 fs::path getTitleSavePath()
diff --git a/src/Cafe/OS/libs/nn_nfp/nn_nfp.cpp b/src/Cafe/OS/libs/nn_nfp/nn_nfp.cpp
index c5d31ac8..26f0194a 100644
--- a/src/Cafe/OS/libs/nn_nfp/nn_nfp.cpp
+++ b/src/Cafe/OS/libs/nn_nfp/nn_nfp.cpp
@@ -199,8 +199,6 @@ void nnNfpExport_SetActivateEvent(PPCInterpreter_t* hCPU)
 	ppcDefineParamStructPtr(osEvent, coreinit::OSEvent, 0);
 	ppcDefineParamMPTR(osEventMPTR, 0);
 
-	debug_printf("nn_nfp.SetActivateEvent(0x%08x)\n", osEventMPTR);
-
 	coreinit::OSInitEvent(osEvent, coreinit::OSEvent::EVENT_STATE::STATE_NOT_SIGNALED, coreinit::OSEvent::EVENT_MODE::MODE_AUTO);
 
 	nnNfpLock();
@@ -228,7 +226,6 @@ void nnNfpExport_SetDeactivateEvent(PPCInterpreter_t* hCPU)
 
 void nnNfpExport_Initialize(PPCInterpreter_t* hCPU)
 {
-	debug_printf("Nfp Initialize()\n");
 	nfp_data.nfpIsInitialized = true;
 	nfp_data.isDetecting = false;
 	nfp_data.hasActiveAmiibo = false;
diff --git a/src/config/LaunchSettings.cpp b/src/config/LaunchSettings.cpp
index 1de64eeb..04436f85 100644
--- a/src/config/LaunchSettings.cpp
+++ b/src/config/LaunchSettings.cpp
@@ -151,7 +151,7 @@ std::optional<int> LaunchSettings::HandleCommandline(const std::vector<std::wstr
             try {
                 if (titleParam.starts_with('='))
                     titleParam.erase(titleParam.begin());
-            	TitleId titleId;
+            	TitleId titleId{};
             	if (!TitleIdParser::ParseFromStr(titleParam, titleId))
             		std::cerr << "Invalid title id format";
                 s_load_title_id = titleId;
diff --git a/src/gui/wxgui/CemuApp.cpp b/src/gui/wxgui/CemuApp.cpp
index bb7b6c7c..46958aed 100644
--- a/src/gui/wxgui/CemuApp.cpp
+++ b/src/gui/wxgui/CemuApp.cpp
@@ -385,22 +385,6 @@ bool CemuApp::OnInit()
 		wxWlSetAppId(m_mainFrame, "info.cemu.Cemu");
 #endif
 
-	// show warning on macOS about state of builds
-#if BOOST_OS_MACOS
-	if (!config.did_show_macos_disclaimer)
-	{
-		const auto message = _(
-			"Thank you for testing the in-development build of Cemu for macOS.\n \n"
-			"The macOS port is currently purely experimental and should not be considered stable or ready for issue-free gameplay. "
-			"There are also known issues with degraded performance due to the use of MoltenVk and Rosetta for ARM Macs. We appreciate your patience while we improve Cemu for macOS.");
-		wxMessageDialog dialog(nullptr, message, _("Preview version"), wxCENTRE | wxOK | wxICON_WARNING);
-		dialog.SetOKLabel(_("I understand"));
-		dialog.ShowModal();
-		config.did_show_macos_disclaimer = true;
-		GetConfigHandle().Save();
-	}
-#endif
-
 	return true;
 }
 
diff --git a/src/gui/wxgui/wxCemuConfig.h b/src/gui/wxgui/wxCemuConfig.h
index 0be9ea2f..9fede16c 100644
--- a/src/gui/wxgui/wxCemuConfig.h
+++ b/src/gui/wxgui/wxCemuConfig.h
@@ -100,7 +100,7 @@ struct wxCemuConfig
 
 	ConfigValue<bool> did_show_vulkan_warning{false};
 	ConfigValue<bool> did_show_graphic_pack_download{false}; // no longer used but we keep the config value around in case people downgrade Cemu. Despite the name this was used for the Getting Started dialog
-	ConfigValue<bool> did_show_macos_disclaimer{false};
+	ConfigValue<bool> did_show_macos_disclaimer{false}; // no longer used
 
 	ConfigValue<bool> show_icon_column{true};