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
3d3ada01
Commit
3d3ada01
authored
Jul 22, 2017
by
Wescoeur
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(app): execute command at startup correctly (not when core is restarted)
parent
d4e89205
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
14 deletions
+7
-14
App.cpp
src/app/App.cpp
+7
-14
No files found.
src/app/App.cpp
View file @
3d3ada01
...
...
@@ -173,6 +173,13 @@ void App::initContentApp () {
// Init core.
CoreManager
::
init
(
this
,
mParser
->
value
(
"config"
));
// Execute command argument if needed.
if
(
!
mEngine
)
{
const
QString
commandArgument
=
getCommandArgument
();
if
(
!
commandArgument
.
isEmpty
())
mCli
->
executeCommand
(
commandArgument
);
}
// Init engine content.
mEngine
=
new
QQmlApplicationEngine
();
...
...
@@ -215,13 +222,6 @@ void App::initContentApp () {
if
(
mEngine
->
rootObjects
().
isEmpty
())
qFatal
(
"Unable to open main window."
);
// Execute command argument if needed.
{
const
QString
commandArgument
=
getCommandArgument
();
if
(
!
commandArgument
.
isEmpty
())
mCli
->
executeCommand
(
commandArgument
);
}
QObject
::
connect
(
CoreManager
::
getInstance
()
->
getHandlers
().
get
(),
&
CoreHandlers
::
coreStarted
,
...
...
@@ -551,13 +551,6 @@ void App::openAppAfterInit () {
}
}
// Execute command argument if needed.
{
const
QString
commandArgument
=
getCommandArgument
();
if
(
!
commandArgument
.
isEmpty
())
mCli
->
executeCommand
(
commandArgument
);
}
#ifdef ENABLE_UPDATE_CHECK
QTimer
*
timer
=
new
QTimer
(
mEngine
);
timer
->
setInterval
(
VERSION_UPDATE_CHECK_INTERVAL
);
...
...
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