diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-07-29 22:17:21 (GMT) |
---|---|---|
committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-08-02 01:22:09 (GMT) |
commit | 2fe8d61e251f374ee91e953ededafb415c9f7e46 (patch) | |
tree | a52e9b12a64f4339c7efd29d9bb5352357929e7c /examples | |
parent | 0353efbbb97cf0225bc3f9771e6dca366c30aaa1 (diff) | |
download | Qt-2fe8d61e251f374ee91e953ededafb415c9f7e46.zip Qt-2fe8d61e251f374ee91e953ededafb415c9f7e46.tar.gz Qt-2fe8d61e251f374ee91e953ededafb415c9f7e46.tar.bz2 |
Fix crash on Desktop platforms.
Missing check for null networkSession.
Task-number: QTBUG-12501
(cherry picked from commit 597a842d66dc04181bfd063863216acbb11ce3bc)
Diffstat (limited to 'examples')
-rw-r--r-- | examples/network/fortuneserver/server.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp index b931b96..4dca38c 100644 --- a/examples/network/fortuneserver/server.cpp +++ b/examples/network/fortuneserver/server.cpp @@ -107,17 +107,19 @@ Server::Server(QWidget *parent) void Server::sessionOpened() { // Save the used configuration - QNetworkConfiguration config = networkSession->configuration(); - QString id; - if (config.type() == QNetworkConfiguration::UserChoice) - id = networkSession->sessionProperty(QLatin1String("UserChoiceConfiguration")).toString(); - else - id = config.identifier(); - - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); - settings.beginGroup(QLatin1String("QtNetwork")); - settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); - settings.endGroup(); + if (networkSession) { + QNetworkConfiguration config = networkSession->configuration(); + QString id; + if (config.type() == QNetworkConfiguration::UserChoice) + id = networkSession->sessionProperty(QLatin1String("UserChoiceConfiguration")).toString(); + else + id = config.identifier(); + + QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + settings.beginGroup(QLatin1String("QtNetwork")); + settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); + settings.endGroup(); + } //! [0] //! [1] tcpServer = new QTcpServer(this); |