blob: 8cbf1276966105df132ec2414d21169fdeec01d9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From 54f7e8cb0433e8cfe607f4f6b9db015156e1c101 Mon Sep 17 00:00:00 2001
From: Gaerzi <gaerzi@gmail.com>
Date: Fri, 17 Jan 2014 14:28:53 +0100
Subject: [PATCH] Restored a few CHR() that were in fact needed.
---
src/MainApp.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/MainApp.cpp b/src/MainApp.cpp
index d1f7ffa..e2b893b 100644
--- a/src/MainApp.cpp
+++ b/src/MainApp.cpp
@@ -861,14 +861,14 @@ void MainApp::readConfigFile()
if (!token.Cmp("base_resource_paths"))
{
// Skip {
- token = wxString::FromUTF8(tz.getToken());
+ token = wxString::FromUTF8(CHR(tz.getToken()));
// Read paths until closing brace found
token = tz.getToken();
while (token.Cmp("}"))
{
theArchiveManager->addBaseResourcePath(token);
- token = wxString::FromUTF8(tz.getToken());
+ token = wxString::FromUTF8(CHR(tz.getToken()));
}
}
@@ -879,11 +879,11 @@ void MainApp::readConfigFile()
token = tz.getToken();
// Read files until closing brace found
- token = wxString::FromUTF8(tz.getToken());
+ token = wxString::FromUTF8(CHR(tz.getToken()));
while (token != "}")
{
theArchiveManager->addRecentFile(token);
- token = wxString::FromUTF8(tz.getToken());
+ token = wxString::FromUTF8(CHR(tz.getToken()));
}
}
--
1.8.5.3
|