Ticket #3720: no-master-connect2.patch
File no-master-connect2.patch, 1.1 KB (added by , 17 years ago) |
---|
-
libs/libmyth/mythcontext.cpp
857 857 QString server = gContext->GetSetting("MasterServerIP", "localhost"); 858 858 int port = gContext->GetNumSetting("MasterServerPort", 6543); 859 859 860 if (!d->eventSock) 861 d->eventSock = new MythSocket(); 860 if (!d->eventSock) 861 { 862 // if I'm the master backend, don't create a socket for events, 863 // This could lead to a case where recusively send myself events. 864 if (!IsMasterBackend()) 865 d->eventSock = new MythSocket(); 866 } 862 867 863 868 if (!d->serverSock) 864 869 d->serverSock = ConnectServer(d->eventSock, server, port, blockingClient); … … 2544 2549 { 2545 2550 (void)sock; 2546 2551 2547 while (d->eventSock->state() == MythSocket::Connected && 2552 while (d->eventSock && 2553 d->eventSock->state() == MythSocket::Connected && 2548 2554 d->eventSock->bytesAvailable() > 0) 2549 2555 { 2550 2556 QStringList strlist;