Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
259
Issues
259
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Multimedia
Kdenlive
Commits
a610f581
Commit
a610f581
authored
Aug 30, 2020
by
Jean-Baptiste Mardelle
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Another attempt to fix Windows locale corruption on Windows
related to
#780
parent
865042c8
Pipeline
#32354
passed with stage
in 37 minutes and 44 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
src/monitor/monitor.cpp
src/monitor/monitor.cpp
+5
-3
No files found.
src/monitor/monitor.cpp
View file @
a610f581
...
...
@@ -20,6 +20,7 @@
#include "monitor.h"
#include "bin/bin.h"
#include "bin/projectclip.h"
#include "lib/localeHandling.h"
#include "core.h"
#include "dialogs/profilesdialog.h"
#include "doc/kdenlivedoc.h"
...
...
@@ -1694,13 +1695,14 @@ const QString Monitor::sceneList(const QString &root, const QString &fullPath)
{
// on Windows, the xml consumer doesn't follow LC_NUMERIC, so enforce locale
#ifdef Q_OS_WIN
QLocale
currentLocale
;
// For restoring after XML export
auto
currentLocale
=
strdup
(
setlocale
(
LC_ALL
,
nullptr
));
std
::
setlocale
(
LC_ALL
,
"C"
);
qDebug
()
<<
"Current locale is "
<<
currentLocale
;
QLocale
::
setDefault
(
QLocale
::
c
());
// Not sure if helpful
#endif
const
QString
resultScene
=
m_glMonitor
->
sceneList
(
root
,
fullPath
);
#ifdef Q_OS_WIN
QLocale
::
setDefault
(
currentLocale
);
std
::
setlocale
(
LC_ALL
,
currentLocale
);
LocaleHandling
::
resetLocale
();
#endif
return
resultScene
;
}
...
...
Eugen Mohr
@emohr
mentioned in issue
#787 (closed)
·
Aug 31, 2020
mentioned in issue
#787 (closed)
mentioned in issue #787
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment