Revision

14681

Author

jmesquita

Date

2009-08-30 00:24:13 -0500 (Sun, 30 Aug 2009)

Log Message

Fix segv when deleting tab. Thank you Apple for telling me that.

Modified Paths

• freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp
• freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp
• freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp
• freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h
• freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp
• freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h

Diff

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp	2009-08-30 04:58:11 UTC (rev 14680)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp	2009-08-30 05:24:13 UTC (rev 14681)
@@ -134,7 +134,6 @@
     pluginsDir->setCurrent(dir);
 #if defined(Q_OS_MAC)
     dir = qApp->applicationDirPath();
-    qDebug() << dir;
     pluginsDir->setCurrent(dir);
     pluginsDir->cd("../PlugIns/fsgui/");
 #endif

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp	2009-08-30 04:58:11 UTC (rev 14680)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/servermanager.cpp	2009-08-30 05:24:13 UTC (rev 14681)
@@ -77,6 +77,7 @@
         }
         if ( _ESLpoolCount.value(name).count() == 0 )
         {
+            qDebug() << "We are deleting";
             delete _ESLpool.take(name);
             _ESLpoolCount.remove(name);
         }

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp	2009-08-30 04:58:11 UTC (rev 14680)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp	2009-08-30 05:24:13 UTC (rev 14681)
@@ -433,6 +433,8 @@
 
 void ConsolePlugin::tabChanged(int index)
 {
+    if (index == -1)
+        return;
     ESLconnection *esl = serverManager->getESLconnection(PLUGIN_NAME, consoleWindow->tabConsole->tabText(index));
     if (esl)
     {

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h	2009-08-30 04:58:11 UTC (rev 14680)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h	2009-08-30 05:24:13 UTC (rev 14681)
@@ -68,7 +68,7 @@
     void setServerManager(ServerManager *manager);
 
 protected:
-    void closeEvent(QCloseEvent *event);
+    void closeEvent( QCloseEvent *event );
     void showEvent ( QShowEvent * event );
 
 private slots:

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp	2009-08-30 04:58:11 UTC (rev 14680)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp	2009-08-30 05:24:13 UTC (rev 14681)
@@ -67,6 +67,7 @@
 
 
     esl->connect();
+    eslName = esl->getName();
 
     msm = new MonitorStateMachine();
     msm->addESLconnection(esl);
@@ -319,7 +320,7 @@
 {
     QSettings settings;
     settings.beginGroup("Console");
-    settings.beginGroup(esl->getName());
+    settings.beginGroup(eslName);
     /* Save the current loglevel */
     settings.setValue("Loglevel", currentLogLevel);
     settings.endGroup();

--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h	2009-08-30 04:58:11 UTC (rev 14680)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h	2009-08-30 05:24:13 UTC (rev 14681)
@@ -97,6 +97,7 @@
     QModelIndexList foundItems;
     SortFilterProxyModel *model;
     ESLconnection *esl;
+    QString eslName;
     MonitorStateMachine *msm;
     RealtimeStatisticsDialog *_rtStatsDlg;
     pastebinDialog *_pastebinDlg;