Only log about stopping or destroying a DLL if it was actually stoppe…

…d or destroyed
xbmc · Aug 4, 2012 · b9d1ac8 · b9d1ac8
1 parent 87f3fac
commit b9d1ac8
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/xbmc/addons/AddonDll.h b/xbmc/addons/AddonDll.h
@@ -234,13 +234,16 @@ void CAddonDll<TheDll, TheStruct, TheProps>::Stop()
       }
       CAddon::SaveSettings();
     }
-    if (m_pDll) m_pDll->Stop();
+    if (m_pDll)
+    {
+      m_pDll->Stop();
+      CLog::Log(LOGINFO, "ADDON: Dll Stopped - %s", Name().c_str());
+    }
   }
   catch (std::exception &e)
   {
     HandleException(e, "m_pDll->Stop");
   }
-  CLog::Log(LOGINFO, "ADDON: Dll Stopped - %s", Name().c_str());
 }
 
 template<class TheDll, typename TheStruct, typename TheProps>
@@ -261,10 +264,13 @@ void CAddonDll<TheDll, TheStruct, TheProps>::Destroy()
   }
   free(m_pStruct);
   m_pStruct = NULL;
-  delete m_pDll;
+  if (m_pDll)
-  m_pDll = NULL;
+  {
+    delete m_pDll;
+    m_pDll = NULL;
+    CLog::Log(LOGINFO, "ADDON: Dll Destroyed - %s", Name().c_str());
+  }
   m_initialized = false;
-  CLog::Log(LOGINFO, "ADDON: Dll Destroyed - %s", Name().c_str());
 }
 
 template<class TheDll, typename TheStruct, typename TheProps>