summaryrefslogtreecommitdiff
path: root/RealtimeSync/resources.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'RealtimeSync/resources.cpp')
-rw-r--r--RealtimeSync/resources.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/RealtimeSync/resources.cpp b/RealtimeSync/resources.cpp
index 41e16808..f81af50a 100644
--- a/RealtimeSync/resources.cpp
+++ b/RealtimeSync/resources.cpp
@@ -29,12 +29,13 @@ GlobalResources::GlobalResources()
//activate support for .png files
wxImage::AddHandler(new wxPNGHandler); //ownership passed
- wxZipInputStream resourceFile(input);
+ wxZipInputStream resourceFile(input, wxConvUTF8);
+ //do NOT rely on wxConvLocal! May result in "Cannot convert from the charset 'Unknown encoding (-1)'!"
while (true)
{
std::unique_ptr<wxZipEntry> entry(resourceFile.GetNextEntry());
- if (entry.get() == NULL)
+ if (entry.get() == nullptr)
break;
const wxString name = entry->GetName();
bgstack15