mirror of
https://github.com/AleziaKurdis/overte.git
synced 2025-04-08 06:32:35 +02:00
Merge pull request #1147 from daleglass/fix-null-pointer-arithmetic-warning
Fix warning: NULL used in arithmetic
This commit is contained in:
commit
286976addb
1 changed files with 2 additions and 2 deletions
|
@ -1545,9 +1545,9 @@ void DomainServer::sendHeartbeatToMetaverse(const QString& networkAddress, const
|
|||
|
||||
static const QString PORT_SETTINGS_KEY = "domain_server." + PUBLIC_SOCKET_PORT_KEY;
|
||||
const int portFromSettings = _settingsManager.valueForKeyPath(PORT_SETTINGS_KEY).toInt();
|
||||
if (port != NULL) {
|
||||
if (port != 0) {
|
||||
domainObject[PUBLIC_SOCKET_PORT_KEY] = port;
|
||||
} else if (portFromSettings != NULL) {
|
||||
} else if (portFromSettings != 0) {
|
||||
domainObject[PUBLIC_SOCKET_PORT_KEY] = portFromSettings;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue