pkg: Fix recursion in Install destructor.

Prevent creating a shared pointer from this in
destructor, which would lead to recursively
calling the descructor.

diff --git a/simgear/package/Catalog.cxx b/simgear/package/Catalog.cxx
index 49b5acf4f1186b03fac54848db38fd50d183d52c..9d5f4ac78f2c368e73a252d24d8e1f90843e86ea 100644 (file)
--- a/simgear/package/Catalog.cxx
+++ b/simgear/package/Catalog.cxx
@@ -356,7 +356,7 @@ void Catalog::refreshComplete(Delegate::FailureCode aReason)
     m_root->catalogRefreshComplete(this, aReason);
 }
 
-void Catalog::registerInstall(InstallRef ins)
+void Catalog::registerInstall(Install* ins)
 {
   if (!ins || ins->package()->catalog() != this) {
     return;
@@ -365,7 +365,7 @@ void Catalog::registerInstall(InstallRef ins)
   m_installed[ins->package()] = ins;
 }
 
-void Catalog::unregisterInstall(InstallRef ins)
+void Catalog::unregisterInstall(Install* ins)
 {
   if (!ins || ins->package()->catalog() != this) {
     return;

diff --git a/simgear/package/Catalog.hxx b/simgear/package/Catalog.hxx
index 4804af05d7972744d1b523b46e7b2d4ee3faaccf..1d06b9bea60485642b33684da3faa5fe8f94e640 100644 (file)
--- a/simgear/package/Catalog.hxx
+++ b/simgear/package/Catalog.hxx
@@ -124,8 +124,8 @@ private:
     friend class Downloader;
   
     friend class Install;
-    void registerInstall(InstallRef ins);
-    void unregisterInstall(InstallRef ins);
+    void registerInstall(Install* ins);
+    void unregisterInstall(Install* ins);
   
     void parseProps(const SGPropertyNode* aProps);