Kaydet (Commit) a7be6a2e authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Don't use zService if not set

Change-Id: I1043ab54cbffddd316d141e3f5d368849e3070ca
üst f40461a2
...@@ -53,22 +53,24 @@ using namespace sd; ...@@ -53,22 +53,24 @@ using namespace sd;
DiscoveryService::DiscoveryService() DiscoveryService::DiscoveryService()
{ {
zService = NULL;
#ifdef MACOSX #ifdef MACOSX
// Bonjour for OSX // Bonjour for OSX
zService = new OSXNetworkService(); zService = new OSXNetworkService();
#endif #endif
#ifdef LINUX
#ifdef ENABLE_AVAHI #ifdef ENABLE_AVAHI
// Avahi for Linux // Avahi for Linux
char hostname[1024]; char hostname[1024];
hostname[1023] = '\0'; hostname[1023] = '\0';
gethostname(hostname, 1023); gethostname(hostname, 1023);
zService = new AvahiNetworkService(hostname); zService = new AvahiNetworkService(hostname);
#endif
#endif #endif
zService->setup(); if (zService)
zService->setup();
// Old implementation for backward compatibility matter // Old implementation for backward compatibility matter
mSocket = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP ); mSocket = socket( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
...@@ -113,7 +115,8 @@ DiscoveryService::~DiscoveryService() ...@@ -113,7 +115,8 @@ DiscoveryService::~DiscoveryService()
close( mSocket ); close( mSocket );
#endif #endif
zService->clear(); if (zService)
zService->clear();
} }
void SAL_CALL DiscoveryService::run() void SAL_CALL DiscoveryService::run()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment