References #4383

Make m_addressList local to SendNotifyMsg, this is the last stop before
true avoidance with a switch to QWaitCondition and letting the task
queue send the disable (would also prevent the double that can/will
happen now).


git-svn-id: http://svn.mythtv.org/svn/trunk@15286 7dbf422c-18fa-0310-86e9-fd20926502f2

Author: Anduin Withers

mythtv/libs/libmythupnp/upnptasknotify.cpp

@@ -89,9 +89,16 @@ void UPnpNotifyTask::SendNotifyMsg( QSocketDevice *pSocket,
 //                        .arg( sUSN ));
 
     {
-    QMutexLocker qml(&m_mutex); // for m_addressList
-    for ( QStringList::Iterator it  = m_addressList.begin(); 
-                                it != m_addressList.end(); 
+    QMutexLocker qml(&m_mutex); // for addressList
+
+    // ----------------------------------------------------------------------
+    // Refresh IP Address List in case of changes
+    // ----------------------------------------------------------------------
+
+    QStringList addressList = QDeepCopy<QStringList>(UPnp::g_IPAddrList);
+
+    for ( QStringList::Iterator it  = addressList.begin(); 
+                                it != addressList.end(); 
                               ++it ) 
     {
         if (!*it)
@@ -134,12 +141,6 @@ void UPnpNotifyTask::Execute( TaskQueue *pQueue )
     QSocketDevice *pMulticast = new QMulticastSocket( SSDP_GROUP       , SSDP_PORT );
 //    QSocketDevice *pBroadcast = new QBroadcastSocket( "255.255.255.255", SSDP_PORT );
 
-    // ----------------------------------------------------------------------
-    // Refresh IP Address List in case of changes
-    // ----------------------------------------------------------------------
-
-    m_addressList = QDeepCopy<QStringList>(UPnp::g_IPAddrList);
-
     // ----------------------------------------------------------------------
     // Must send rootdevice Notification for first device.
     // ----------------------------------------------------------------------

mythtv/libs/libmythupnp/upnptasknotify.h

@@ -56,9 +56,6 @@ class UPnpNotifyTask : public Task
         int             m_nMaxAge;    
 
         UPnpNotifyNTS   m_eNTS;
-        
-        QStringList     m_addressList;
-
 
     protected: