From f1412aad7761c6f488bf2d5f707b95f5ddb01e75 Mon Sep 17 00:00:00 2001
From: Peter Repukat <orly.alia5@gmail.com>
Date: Fri, 19 Nov 2021 13:30:26 +0100
Subject: [PATCH] Fix special chars in filenames breaking config creation

---
 GlosSIConfig/Resource.rc | 40 ++++++++++++++++++++++++++++++++++++----
 GlosSIConfig/UIModel.cpp |  6 +++---
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/GlosSIConfig/Resource.rc b/GlosSIConfig/Resource.rc
index 66cfd26..b8c6f06 100644
--- a/GlosSIConfig/Resource.rc
+++ b/GlosSIConfig/Resource.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,2,006008097710
- PRODUCTVERSION 0,0,2,006008097710
+ FILEVERSION 0,0,3,101006047020
+ PRODUCTVERSION 0,0,3,101006047020
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Peter Repukat - FlatspotSoftware"
             VALUE "FileDescription", "GlosSI - Config"
-            VALUE "FileVersion", "0.0.2.0-6-g8d9771f"
+            VALUE "FileVersion", "0.0.3.1-1-g6f47020"
             VALUE "InternalName", "GlosSIConfig"
             VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware"
             VALUE "OriginalFilename", "GlosSIConfig.exe"
             VALUE "ProductName", "GlosSi"
-            VALUE "ProductVersion", "0.0.2.0-6-g8d9771f"
+            VALUE "ProductVersion", "0.0.3.1-1-g6f47020"
         END
     END
     BLOCK "VarFileInfo"
@@ -294,6 +294,38 @@ END
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/GlosSIConfig/UIModel.cpp b/GlosSIConfig/UIModel.cpp
index a9c42bd..9f3d29c 100644
--- a/GlosSIConfig/UIModel.cpp
+++ b/GlosSIConfig/UIModel.cpp
@@ -58,7 +58,7 @@ void UIModel::readConfigs()
     std::for_each(entries.begin(), entries.end(), [this](const auto& name) {
         auto path = config_path_;
         path /= config_dir_name_.toStdString();
-        path /= name.toStdString();
+        path /= name.toStdWString();
         QFile file(path);
         if (!file.open(QIODevice::Text | QIODevice::ReadOnly)) {
             // meh
@@ -248,8 +248,8 @@ void UIModel::setAcrylicEffect(bool has_acrylic_affect)
 void UIModel::writeTarget(const QJsonObject& json, const QString& name)
 {
     auto path = config_path_;
-    path /= config_dir_name_.toStdString();
-    path /= (name + ".json").toStdString();
+    path /= config_dir_name_.toStdWString();
+    path /= (name + ".json").toStdWString();
     QFile file(path);
     if (!file.open(QIODevice::Text | QIODevice::ReadWrite)) {
         // meh