From fc8cd27e4c0c8a48ebc151f73639a573e9e5c7f0 Mon Sep 17 00:00:00 2001
From: B Stack <bgstack15@gmail.com>
Date: Sat, 18 Apr 2020 12:59:51 -0400
Subject: add upstream 10.23

---
 zen/zstring.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'zen/zstring.cpp')

diff --git a/zen/zstring.cpp b/zen/zstring.cpp
index 82082df0..8b16e02d 100644
--- a/zen/zstring.cpp
+++ b/zen/zstring.cpp
@@ -59,7 +59,7 @@ Zstring getUnicodeNormalForm(const Zstring& str)
     {
         gchar* outStr = ::g_utf8_normalize(str.c_str(), str.length(), G_NORMALIZE_DEFAULT_COMPOSE);
         if (!outStr)
-            throw SysError(L"g_utf8_normalize: conversion failed. (" + utfTo<std::wstring>(str) + L')');
+            throw SysError(formatSystemError("g_utf8_normalize(" + utfTo<std::string>(str) + ')', L"", L"Conversion failed."));
         ZEN_ON_SCOPE_EXIT(::g_free(outStr));
         return outStr;
 
-- 
cgit