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
353398c7
Commit
353398c7
authored
Apr 27, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(src/components/settings/AccountSettingsModel): remove assert when null proxy is set
parent
5a149a72
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
AccountSettingsModel.cpp
...-desktop/src/components/settings/AccountSettingsModel.cpp
+0
-2
SingleApplication.cpp
...op/src/externals/single-application/SingleApplication.cpp
+1
-1
No files found.
linphone-desktop/src/components/settings/AccountSettingsModel.cpp
View file @
353398c7
...
...
@@ -109,8 +109,6 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr<li
}
void
AccountSettingsModel
::
setDefaultProxyConfig
(
const
shared_ptr
<
linphone
::
ProxyConfig
>
&
proxyConfig
)
{
Q_ASSERT
(
proxyConfig
!=
nullptr
);
CoreManager
::
getInstance
()
->
getCore
()
->
setDefaultProxyConfig
(
proxyConfig
);
emit
accountSettingsUpdated
();
}
...
...
linphone-desktop/src/externals/single-application/SingleApplication.cpp
View file @
353398c7
...
...
@@ -256,7 +256,7 @@ void SingleApplicationPrivate::connectToPrimary (int msecs, char connectionType)
cout
<<
"[PROCESS ABNORMALLY TERMINATED]: "
<<
signum
<<
endl
;
#ifdef Q_OS_LINUX
cout
<<
"
Please to
remove your ~/.ICEauthority file and rerun."
<<
endl
;
cout
<<
"
If you have used valgrind, please
remove your ~/.ICEauthority file and rerun."
<<
endl
;
#endif // ifdef Q_OS_UNIX
::
exit
(
128
+
signum
);
...
...
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