From ca98109ba1dfd6cc955a72778938d96e18ec0910 Mon Sep 17 00:00:00 2001 From: Maxime Gervais Date: Wed, 30 Apr 2025 19:15:32 +0200 Subject: [PATCH] Add ISO8859-1 as fallback encoding when reading core file Signed-off-by: Maxime Gervais --- Source/Common/Core.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Common/Core.cpp b/Source/Common/Core.cpp index 4d69827..9608ed4 100644 --- a/Source/Common/Core.cpp +++ b/Source/Common/Core.cpp @@ -1145,9 +1145,13 @@ int Core::Menu_File_Import_Core(const string &FileName) //CSV //Loading data in an array string Sep=string(1, (char)Buffer[8]); - List.Separator_Set(1, Sep.c_str()); - List.Write((const char*)Buffer); + Ztring ToWrite=Ztring().From_UTF8((const char*)Buffer); + if (ToWrite.empty()) + ToWrite=Ztring().From_ISO_8859_1((const char*)Buffer); //Trying to read as plausible ISO-8859-1 + delete[] Buffer; Buffer=NULL; + List.Separator_Set(1, Sep.c_str()); + List.Write(ToWrite); if (List.empty()) throw "--in-core=: not a valid file"; for (size_t Pos=0; Pos