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
42cb9bc7
Commit
42cb9bc7
authored
Mar 23, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/views/App/Main/MainWindow): avoid crash
parent
c1b38dc6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
9 deletions
+15
-9
CoreManager.hpp
linphone-desktop/src/components/core/CoreManager.hpp
+0
-6
MainWindow.qml
linphone-desktop/ui/views/App/Main/MainWindow.qml
+7
-3
SplashScreen.qml
linphone-desktop/ui/views/App/SplashScreen/SplashScreen.qml
+8
-0
No files found.
linphone-desktop/src/components/core/CoreManager.hpp
View file @
42cb9bc7
...
...
@@ -41,8 +41,6 @@ class QTimer;
class
CoreManager
:
public
QObject
{
Q_OBJECT
;
Q_PROPERTY
(
bool
linphoneCoreCreated
READ
getLinphoneCoreCreated
NOTIFY
linphoneCoreCreated
);
public:
~
CoreManager
()
=
default
;
...
...
@@ -118,10 +116,6 @@ private:
void
createLinphoneCore
(
const
QString
&
config_path
);
bool
getLinphoneCoreCreated
()
{
return
m_promise_build
.
isFinished
();
}
std
::
shared_ptr
<
linphone
::
Core
>
m_core
;
std
::
shared_ptr
<
CoreHandlers
>
m_handlers
;
...
...
linphone-desktop/ui/views/App/Main/MainWindow.qml
View file @
42cb9bc7
...
...
@@ -57,6 +57,11 @@ ApplicationWindow {
// ---------------------------------------------------------------------------
Connections
{
target
:
CoreManager
onLinphoneCoreCreated
:
mainLoader
.
active
=
true
}
Shortcut
{
sequence
:
StandardKey
.
Close
onActivated
:
window
.
hide
()
...
...
@@ -67,12 +72,11 @@ ApplicationWindow {
Loader
{
id
:
mainLoader
active
:
CoreManager
.
linphoneCoreCreated
active
:
false
anchors.fill
:
parent
sourceComponent
:
ColumnLayout
{
// Workaround to get these properties in `MainWindow.js`.
// TODO: Find better Workaround.
readonly
property
alias
collapse
:
collapse
readonly
property
alias
contentLoader
:
contentLoader
readonly
property
alias
menu
:
menu
...
...
@@ -252,6 +256,6 @@ ApplicationWindow {
height
:
MainWindowStyle
.
toolBar
.
height
width
:
MainWindowStyle
.
toolBar
.
leftMargin
onClicked
:
CoreManager
.
linphoneCoreCreated
&&
CoreManager
.
forceRefreshRegisters
()
onClicked
:
CoreManager
.
forceRefreshRegisters
()
}
}
linphone-desktop/ui/views/App/SplashScreen/SplashScreen.qml
0 → 100644
View file @
42cb9bc7
import
QtQuick
2.7
import
QtQuick
.
Window
2.2
// =============================================================================
Window
{
}
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