From a24e2b82a29701b53e1923237812368de8fb5e10 Mon Sep 17 00:00:00 2001 From: Ackurus <84048003+Ackurus@users.noreply.github.com> Date: Mon, 7 Jun 2021 09:26:40 -0400 Subject: Fix path to games.csv file for *nix builds. Change the runtime document path so it will line up with the correct directory in *nix builds. Allows for the settings directory to be accessed such as the games.csv file. --- cmake/opentrack-hier.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake index 16694d1f..6c4827e0 100644 --- a/cmake/opentrack-hier.cmake +++ b/cmake/opentrack-hier.cmake @@ -33,7 +33,7 @@ elseif(WIN32) else() set(opentrack-libexec "libexec/opentrack") set(opentrack-runtime-libexec "/../${opentrack-libexec}/") # MUST HAVE A TRAILING BACKSLASH - set(opentrack-runtime-doc "/share/doc/opentrack/") # MUST HAVE A TRAILING BACKSLASH + set(opentrack-runtime-doc "/../share/doc/opentrack/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-bin "bin") set(opentrack-doc "./share/doc/opentrack") set(opentrack-src "./share/doc/opentrack/source-code") -- cgit v1.2.3 From ba132b05f68bc83dd6212a8add925b52ef41b35a Mon Sep 17 00:00:00 2001 From: Ackurus <84048003+Ackurus@users.noreply.github.com> Date: Mon, 7 Jun 2021 09:29:29 -0400 Subject: Fix segmentation fault on *nix builds. The games.csv file seems to be UTF-8 compatible. Changing the TextCodec from "System" to "UTF-8" prevents segmentation fault on decoding on ArchLinux builds. --- csv/csv.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csv/csv.cpp b/csv/csv.cpp index a1f62dc0..6b4d0bcd 100644 --- a/csv/csv.cpp +++ b/csv/csv.cpp @@ -19,7 +19,7 @@ #include #include -const QTextCodec* const CSV::m_codec = QTextCodec::codecForName("System"); +const QTextCodec* const CSV::m_codec = QTextCodec::codecForName("UTF-8"); const QRegExp CSV::m_rx = QRegExp(QString("((?:(?:[^;\\n]*;?)|(?:\"[^\"]*\";?))*)?\\n?")); const QRegExp CSV::m_rx2 = QRegExp(QString("(?:\"([^\"]*)\";?)|(?:([^;]*);?)?")); -- cgit v1.2.3