From bc524cd0e981d702016e94edfb3e8f8c3cc000f0 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Sat, 27 Apr 2024 19:27:00 -0500
Subject: [PATCH] Show exception message in profile saving

---
 src/g_gamedata.cpp | 3 ++-
 src/k_profiles.cpp | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/g_gamedata.cpp b/src/g_gamedata.cpp
index 6fe481c5e..45b9c6384 100644
--- a/src/g_gamedata.cpp
+++ b/src/g_gamedata.cpp
@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <cstdint>
 #include <cstddef>
+#include <exception>
 #include <filesystem>
 
 #include <fmt/format.h>
@@ -304,7 +305,7 @@ void srb2::save_ng_gamedata()
 		srb2::io::write_exact(file, tcb::as_bytes(tcb::make_span(ubjson)));
 		file.close();
 	}
-	catch (const srb2::io::FileStreamException& ex)
+	catch (const std::exception& ex)
 	{
 		CONS_Alert(CONS_ERROR, "NG Gamedata save failed: %s\n", ex.what());
 	}
diff --git a/src/k_profiles.cpp b/src/k_profiles.cpp
index cc15ee1af..1dd491efc 100644
--- a/src/k_profiles.cpp
+++ b/src/k_profiles.cpp
@@ -12,6 +12,7 @@
 /// \brief implements methods for profiles etc.
 
 #include <algorithm>
+#include <exception>
 
 #include <fmt/format.h>
 
@@ -332,6 +333,10 @@ void PR_SaveProfiles(void)
 
 		fs::rename(tmppath, realpath);
 	}
+	catch (const std::exception& ex)
+	{
+		I_Error("Couldn't save profiles. Are you out of Disk space / playing in a protected folder?\n\nException: %s", ex.what());
+	}
 	catch (...)
 	{
 		I_Error("Couldn't save profiles. Are you out of Disk space / playing in a protected folder?");