more better geterrorstring

no holds barred
etternagame · Sep 2, 2023 · ca15715 · ca15715
1 parent ace7a7a
commit ca15715
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/RageUtil/Graphics/RageDisplay_D3D.cpp b/src/RageUtil/Graphics/RageDisplay_D3D.cpp
@@ -133,11 +133,19 @@ const WCHAR* WINAPI DXGetErrorStringW( _In_ HRESULT hr )
 
 auto GetErrorString(HRESULT hr) -> std::string
 {
+	Locator::getLogger()->warn("RageDisplay_D3D::GetErrorString() - HR {}",
+							   static_cast<long>(hr));
     const wchar_t* msg = DXGetErrorStringW(hr);
     if (msg) {
-        return WStringToString(std::wstring(msg));
+		auto r = WStringToString(std::wstring(msg));
+		if (r.compare("Unknown error.") == 0) {
+			return fmt::format("Unknown error: HR {}", static_cast<long>(hr));
+		} else {
+			return r;
+		}
 	} else {
-		return fmt::format("Unknown error: HR {}", static_cast<long>(hr));
+		return fmt::format("Failed to read error: HR {}",
+						   static_cast<long>(hr));
 	}
 }