diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2012-06-06 13:27:54 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-07 01:51:12 +0200 |
| commit | 702a9d73fa145fd107c8a3f03d68d93b6968af77 (patch) | |
| tree | 649755fced15b82982be02715271ed7e5d6e6d7f /src/plugins/position/simulator/qlocationconnection_simulator.cpp | |
| parent | acdf73a1c2585cb5009e1218f13830c60e1250f5 (diff) | |
| download | qtlocation-702a9d73fa145fd107c8a3f03d68d93b6968af77.tar.gz | |
Fix crash in simulator when connection fails.
Remove the qFatal() and return a null pointer from the factory instead.
Change-Id: Icbc263092cb7e3ce824602e656cc1243b359249b
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Diffstat (limited to 'src/plugins/position/simulator/qlocationconnection_simulator.cpp')
| -rw-r--r-- | src/plugins/position/simulator/qlocationconnection_simulator.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/position/simulator/qlocationconnection_simulator.cpp b/src/plugins/position/simulator/qlocationconnection_simulator.cpp index a35419e1..4f530e41 100644 --- a/src/plugins/position/simulator/qlocationconnection_simulator.cpp +++ b/src/plugins/position/simulator/qlocationconnection_simulator.cpp @@ -67,7 +67,8 @@ namespace Simulator qt_registerLocationTypes(); mWorker = mConnection->connectToServer(Connection::simulatorHostName(true), simulatorPort); if (!mWorker) - qFatal("Could not connect to server"); + return; + mWorker->addReceiver(this); // register for location notifications @@ -85,9 +86,10 @@ namespace Simulator delete mConnection; } - void LocationConnection::ensureSimulatorConnection() + bool LocationConnection::ensureSimulatorConnection() { static LocationConnection locationConnection; + return locationConnection.mWorker; } void LocationConnection::initialLocationDataSent() |