Skip to content

Commit

Permalink
Merge branch 'jb51275' into 'master'
Browse files Browse the repository at this point in the history
[buteo-syncfw] Prioritize network configurations with known bearer types. Contributes to JB#51275

See merge request mer-core/buteo-syncfw!56
  • Loading branch information
adenexter committed Oct 20, 2020
2 parents 91c82ea + 2123671 commit 40cc79a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion libbuteosyncfw/common/NetworkManager.cpp
Expand Up @@ -199,7 +199,8 @@ void NetworkManager::idleRefresh()
bearerTypeName = activeConfigs.first().bearerTypeName();
foreach(const QNetworkConfiguration &conf, activeConfigs)
{
if (conf.bearerType() < connectionType)
if (conf.bearerType() != QNetworkConfiguration::BearerUnknown
&& (conf.bearerType() < connectionType || connectionType == QNetworkConfiguration::BearerUnknown))
{
connectionType = conf.bearerType();
bearerTypeName = conf.bearerTypeName();
Expand Down

0 comments on commit 40cc79a

Please sign in to comment.