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
39cc76d4
Commit
39cc76d4
authored
Jul 04, 2017
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix crashes when starting the application if no linphonerc file exists yet.
parent
dd84961b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
Colors.cpp
src/components/other/colors/Colors.cpp
+1
-1
SettingsModel.cpp
src/components/settings/SettingsModel.cpp
+4
-4
No files found.
src/components/other/colors/Colors.cpp
View file @
39cc76d4
...
...
@@ -71,7 +71,7 @@ void Colors::overrideColors (const shared_ptr<linphone::Config> &config) {
for
(
int
i
=
info
->
propertyOffset
();
i
<
info
->
propertyCount
();
++
i
)
{
const
QMetaProperty
metaProperty
=
info
->
property
(
i
);
const
string
colorName
=
metaProperty
.
name
();
const
string
colorValue
=
config
->
getString
(
COLORS_SECTION
,
colorName
,
""
)
;
const
string
colorValue
=
config
?
config
->
getString
(
COLORS_SECTION
,
colorName
,
""
)
:
""
;
if
(
!
colorValue
.
empty
())
setProperty
(
colorName
.
c_str
(),
QColor
(
::
Utils
::
coreStringToAppString
(
colorValue
)));
...
...
src/components/settings/SettingsModel.cpp
View file @
39cc76d4
...
...
@@ -773,11 +773,11 @@ void SettingsModel::setLogsEmail (const QString &email) {
// ---------------------------------------------------------------------------
QString
SettingsModel
::
getLogsFolder
(
const
shared_ptr
<
linphone
::
Config
>
&
config
)
{
return
::
Utils
::
coreStringToAppString
(
config
->
getString
(
UI_SECTION
,
"logs_folder"
,
Paths
::
getLogsDirPath
())
);
return
::
Utils
::
coreStringToAppString
(
config
?
config
->
getString
(
UI_SECTION
,
"logs_folder"
,
Paths
::
getLogsDirPath
())
:
Paths
::
getLogsDirPath
()
);
}
bool
SettingsModel
::
getLogsEnabled
(
const
shared_ptr
<
linphone
::
Config
>
&
config
)
{
return
config
->
getInt
(
UI_SECTION
,
"logs_enabled"
,
false
)
;
return
config
?
config
->
getInt
(
UI_SECTION
,
"logs_enabled"
,
false
)
:
false
;
}
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