Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
f9c4eb12
Commit
f9c4eb12
authored
Jun 22, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(App): when app is restarted, update language if necessary
parent
e1b11522
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
App.cpp
src/app/App.cpp
+5
-1
No files found.
src/app/App.cpp
View file @
f9c4eb12
...
@@ -142,6 +142,8 @@ inline void activeSplashScreen (QQmlApplicationEngine *engine) {
...
@@ -142,6 +142,8 @@ inline void activeSplashScreen (QQmlApplicationEngine *engine) {
}
}
void
App
::
initContentApp
()
{
void
App
::
initContentApp
()
{
shared_ptr
<
linphone
::
Config
>
config
=
::
getConfigIfExists
(
*
mParser
);
// Destroy qml components and linphone core if necessary.
// Destroy qml components and linphone core if necessary.
if
(
mEngine
)
{
if
(
mEngine
)
{
qInfo
()
<<
QStringLiteral
(
"Restarting app..."
);
qInfo
()
<<
QStringLiteral
(
"Restarting app..."
);
...
@@ -151,6 +153,8 @@ void App::initContentApp () {
...
@@ -151,6 +153,8 @@ void App::initContentApp () {
mSettingsWindow
=
nullptr
;
mSettingsWindow
=
nullptr
;
CoreManager
::
uninit
();
CoreManager
::
uninit
();
initLocale
(
config
);
}
else
{
}
else
{
// Don't quit if last window is closed!!!
// Don't quit if last window is closed!!!
setQuitOnLastWindowClosed
(
false
);
setQuitOnLastWindowClosed
(
false
);
...
@@ -185,7 +189,7 @@ void App::initContentApp () {
...
@@ -185,7 +189,7 @@ void App::initContentApp () {
mEngine
->
addImageProvider
(
ThumbnailProvider
::
PROVIDER_ID
,
new
ThumbnailProvider
());
mEngine
->
addImageProvider
(
ThumbnailProvider
::
PROVIDER_ID
,
new
ThumbnailProvider
());
mColors
=
new
Colors
(
this
);
mColors
=
new
Colors
(
this
);
mColors
->
useConfig
(
::
getConfigIfExists
(
*
mParser
)
);
mColors
->
useConfig
(
config
);
registerTypes
();
registerTypes
();
registerSharedTypes
();
registerSharedTypes
();
...
...
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