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
865042c8
Commit
865042c8
authored
Aug 30, 2020
by
Jean-Baptiste Mardelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enforce C Locale on Windows on rendering.
Related to
#780
parent
74aa66e2
Pipeline
#32311
passed with stage
in 17 minutes and 21 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
src/doc/kdenlivedoc.cpp
src/doc/kdenlivedoc.cpp
+0
-4
src/monitor/monitor.cpp
src/monitor/monitor.cpp
+11
-1
No files found.
src/doc/kdenlivedoc.cpp
View file @
865042c8
...
...
@@ -568,9 +568,6 @@ QDomDocument KdenliveDoc::xmlSceneList(const QString &scene)
bool
KdenliveDoc
::
saveSceneList
(
const
QString
&
path
,
const
QString
&
scene
)
{
QLocale
currentLocale
;
// For restoring after XML export
qDebug
()
<<
"Current locale is "
<<
currentLocale
;
QLocale
::
setDefault
(
QLocale
::
c
());
// Not sure if helpful …
QDomDocument
sceneList
=
xmlSceneList
(
scene
);
if
(
sceneList
.
isNull
())
{
// Make sure we don't save if scenelist is corrupted
...
...
@@ -618,7 +615,6 @@ bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene)
}
const
QByteArray
sceneData
=
sceneList
.
toString
().
toUtf8
();
QLocale
::
setDefault
(
currentLocale
);
file
.
write
(
sceneData
);
if
(
!
file
.
commit
())
{
...
...
src/monitor/monitor.cpp
View file @
865042c8
...
...
@@ -1692,7 +1692,17 @@ void Monitor::resetConsumer(bool fullReset)
const
QString
Monitor
::
sceneList
(
const
QString
&
root
,
const
QString
&
fullPath
)
{
return
m_glMonitor
->
sceneList
(
root
,
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
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
);
#endif
return
resultScene
;
}
void
Monitor
::
updateClipZone
(
const
QPoint
zone
)
...
...
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