[fix] missing deallocator from the progress dialog.

xbmc · Oct 21, 2012 · 2289464 · 2289464
1 parent 22a3fed
commit 2289464
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/xbmc/interfaces/legacy/Dialog.cpp b/xbmc/interfaces/legacy/Dialog.cpp
@@ -230,8 +230,18 @@ namespace XBMCAddon
       return value;
     }
 
-    DialogProgress::~DialogProgress() {}
+    DialogProgress::~DialogProgress() { TRACE; deallocating(); }
 
+    void DialogProgress::deallocating()
+    {
+      TRACE;
+
+      if (dlg)
+      {
+        DelayedCallGuard dg;
+        dlg->Close();
+      }
+    }
 
     void DialogProgress::create(const String& heading, const String& line1, 
                                 const String& line2,

diff --git a/xbmc/interfaces/legacy/Dialog.h b/xbmc/interfaces/legacy/Dialog.h
@@ -224,9 +224,12 @@ namespace XBMCAddon
     {
       CGUIDialogProgress* dlg;
 
+    protected:
+      virtual void deallocating();
+
     public:
 
-      DialogProgress() : AddonClass("DialogProgress") {}
+      DialogProgress() : AddonClass("DialogProgress"), dlg(NULL) {}
       virtual ~DialogProgress();