flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 13:36:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix assert in DBus if dbus_server_listen returned NULL

Browse Source 
ref T589
This commit is contained in:
Roland Rossgotterer
2019-04-03 08:59:54 +02:00
committed by Mat Sutcliffe
parent 77acffb73e
commit 821e0b10b6
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/xswiftbus/dbusserver.cpp
View File

@@ -34,23 +34,30 @@ namespace XSwiftBus
DBusError error;
dbus_error_init(&error);
m_server.reset(dbus_server_listen(address.c_str(), &error));
if (! m_server)
{
ERROR_LOG("DBus failed to listen for new connections on given address: " + std::string(error.message));
return false;
}
dbus_server_set_new_connection_function(m_server.get(), onNewConnection, this, nullptr);
return true;
}
bool CDBusServer::isConnected() const
{
return dbus_server_get_is_connected(m_server.get());
return m_server ? dbus_server_get_is_connected(m_server.get()) : false;
}
void CDBusServer::close()
{
dbus_server_disconnect(m_server.get());
if (m_server) { dbus_server_disconnect(m_server.get()); }
}
void CDBusServer::setDispatcher(CDBusDispatcher *dispatcher)
{
assert(dispatcher);
assert(m_server);
m_dispatcher = dispatcher;