[Try 1] to fix startup crash.

Reproduce crash: 1- open app. 2- grant permissions. 3- app crashed. 4- reopen the app -- OK!
opengisch · Sep 14, 2024 · cd74cc9 · cd74cc9
1 parent 661a623
commit cd74cc9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/core/positioning/egenioussreceiver.cpp b/src/core/positioning/egenioussreceiver.cpp
@@ -5,14 +5,20 @@
 #include <QJsonValue>
 
 EgenioussReceiver::EgenioussReceiver( QObject *parent )
- : AbstractGnssReceiver( parent ), mTcpSocket( new QTcpSocket( this ) )
+ : AbstractGnssReceiver( parent ), mTcpSocket( new QTcpSocket() )
 {
  connect( mTcpSocket, &QTcpSocket::readyRead, this, &EgenioussReceiver::onReadyRead );
  connect( mTcpSocket, &QTcpSocket::errorOccurred, this, &EgenioussReceiver::onErrorOccurred );
  connect( mTcpSocket, &QTcpSocket::connected, this, &EgenioussReceiver::connected );
  connect( mTcpSocket, &QTcpSocket::disconnected, this, &EgenioussReceiver::disconnected );
 }
 
+EgenioussReceiver::~EgenioussReceiver()
+{
+ mTcpSocket->deleteLater();
+ mTcpSocket = nullptr;
+}
+
 void EgenioussReceiver::handleConnectDevice()
 {
  mTcpSocket->connectToHost( mAddress, mPort, QTcpSocket::ReadWrite );

diff --git a/src/core/positioning/positioningdevicemodel.cpp b/src/core/positioning/positioningdevicemodel.cpp
@@ -173,7 +173,7 @@ const QString PositioningDeviceModel::deviceId( const Device &device ) const
  return QStringLiteral( "serial:%1" ).arg( device.settings.value( QStringLiteral( "address" ) ).toString() );
 
  case EgenioussDevice:
- return QStringLiteral( "egeniouss:%1:%2" ).arg( device.settings.value( QStringLiteral( "address" ) ).toString(), QString::number( device.settings.value( QStringLiteral( "port" ) ).toInt() ) );
+ return QStringLiteral( "egeniouss:" );
  }
 
  return QString();

diff --git a/src/qml/QFieldSettings.qml b/src/qml/QFieldSettings.qml
@@ -871,6 +871,8 @@ Page {
  return Theme.getThemeVectorIcon('ic_udp_receiver_black_24dp');
  case PositioningDeviceModel.SerialPortDevice:
  return Theme.getThemeVectorIcon('ic_serial_port_receiver_black_24dp');
+ case PositioningDeviceModel.EgenioussDevice:
+ return Theme.getThemeVectorIcon('ic_serial_port_receiver_black_24dp');
  }
  return '';
  }
@@ -897,6 +899,8 @@ Page {
  return Theme.getThemeVectorIcon('ic_udp_receiver_black_24dp');
  case PositioningDeviceModel.SerialPortDevice:
  return Theme.getThemeVectorIcon('ic_serial_port_receiver_black_24dp');
+ case PositioningDeviceModel.EgenioussDevice:
+ return Theme.getThemeVectorIcon('ic_serial_port_receiver_black_24dp');
  }
  return '';
  }