Revision
14606
Author
jmesquita
Date
2009-08-23 17:53:01 -0500 (Sun, 23 Aug 2009)

Log Message

Fix how we unload plugins

Modified Paths

Diff

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp (14605 => 14606)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp	2009-08-23 22:38:11 UTC (rev 14605)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp	2009-08-23 22:53:01 UTC (rev 14606)
@@ -44,6 +44,11 @@
     settingsDialog->show();
 }
 
+AppManager::~AppManager()
+{
+    unloadPlugins();
+}
+
 void AppManager::changePluginDir()
 {
      QString dir = QFileDialog::getExistingDirectory(settingsDialog, tr("Plugin Location"),
@@ -148,7 +153,7 @@
             settingsDialog->removeConfigItem(j.key(), j.value());
         }
         delete list_available_monitor_plugins.at(i);
-        list_available_monitor_plugins.takeAt(i)->_loader->unload();
+        //list_available_monitor_plugins.takeAt(i)->_loader->unload();
     }
 }
 

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.h (14605 => 14606)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.h	2009-08-23 22:38:11 UTC (rev 14605)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.h	2009-08-23 22:53:01 UTC (rev 14606)
@@ -75,6 +75,7 @@
 
 public:
     AppManager(QObject *parent = 0);
+    ~AppManager();
 
 private:
     /*!

Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp (14605 => 14606)


--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp	2009-08-23 22:38:11 UTC (rev 14605)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp	2009-08-23 22:53:01 UTC (rev 14606)
@@ -72,6 +72,8 @@
 
 ConsoleTabWidget::~ConsoleTabWidget()
 {
+    esl->disconnect();
+    esl->wait();
     writeSettings();
     delete m_ui;
 }