put logger catch back

spelunky-fyi · Feb 4, 2021 · c45d8b5 · c45d8b5
1 parent cd68a0f
commit c45d8b5
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/shared/logger.h b/src/shared/logger.h
@@ -6,10 +6,20 @@
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
 
-#define COMMON_FORMATTER(name, format, ...)                 \
-    try {                                                   \
-        fmt::print("[" name "] " format "\n", __VA_ARGS__); \
-    } catch (...) {} // shit don't work
+#define COMMON_FORMATTER(name, format, ...)                                                                                                          \
+    try                                                                                                                                              \
+    {                                                                                                                                                \
+        fmt::print("[" name "] " format "\n", __VA_ARGS__);                                                                                          \
+    }                                                                                                                                                \
+    catch (fmt::format_error & e)                                                                                                                    \
+    {                                                                                                                                                \
+        puts("Formatting exception:" format);                                                                                                        \
+        puts(__FILE__ " at " TOSTRING(__LINE__));                                                                                                    \
+        puts(e.what());                                                                                                                              \
+    }                                                                                                                                                \
+    catch (...)                                                                                                                                      \
+    {                                                                                                                                                \
+    }
 
 #define PANIC(format, ...)                              \
     do {                                                \