diff --git a/deploy/hyperion.tar.gz.REMOVED.git-id b/deploy/hyperion.tar.gz.REMOVED.git-id index cc007f11..cbbe9a26 100644 --- a/deploy/hyperion.tar.gz.REMOVED.git-id +++ b/deploy/hyperion.tar.gz.REMOVED.git-id @@ -1 +1 @@ -cc218832df7b1806355dc00559924630e3bc54be \ No newline at end of file +fb67681c8c942ffe2236a4ea3a41d4102c3fbb2e \ No newline at end of file diff --git a/src/hyperion-remote/hyperion-remote.cpp b/src/hyperion-remote/hyperion-remote.cpp index f09f90e1..4fdee922 100644 --- a/src/hyperion-remote/hyperion-remote.cpp +++ b/src/hyperion-remote/hyperion-remote.cpp @@ -4,6 +4,7 @@ // Qt includes #include +#include // getoptPlusPLus includes #include @@ -27,10 +28,12 @@ int count(std::initializer_list values) int main(int argc, char * argv[]) { - setlocale(LC_ALL, "C"); - QCoreApplication app(argc, argv); + // force the locale + setlocale(LC_ALL, "C"); + QLocale::setDefault(QLocale::c()); + try { // some default settings diff --git a/src/hyperion-v4l2/hyperion-v4l2.cpp b/src/hyperion-v4l2/hyperion-v4l2.cpp index b6bfda4a..ab7fbb81 100644 --- a/src/hyperion-v4l2/hyperion-v4l2.cpp +++ b/src/hyperion-v4l2/hyperion-v4l2.cpp @@ -30,6 +30,7 @@ void saveScreenshot(void *, const Image & image) int main(int argc, char** argv) { + // force the locale setlocale(LC_ALL, "C"); try diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp index 7aadc94d..db29c89e 100644 --- a/src/hyperiond/hyperiond.cpp +++ b/src/hyperiond/hyperiond.cpp @@ -6,6 +6,7 @@ // QT includes #include #include +#include // config includes #include "HyperionConfig.h" @@ -71,7 +72,6 @@ Json::Value loadConfig(const std::string & configFile) int main(int argc, char** argv) { std::cout << "Application build time: " << __DATE__ << " " << __TIME__ << std::endl; - std::cout << "Locale = " << setlocale(LC_ALL, "C") << std::endl; // Initialising QCoreApplication QCoreApplication app(argc, argv); @@ -80,6 +80,10 @@ int main(int argc, char** argv) signal(SIGINT, signal_handler); signal(SIGTERM, signal_handler); + // force the locale + setlocale(LC_ALL, "C"); + QLocale::setDefault(QLocale::c()); + if (argc < 2) { std::cout << "Missing required configuration file. Usage:" << std::endl;