Revision

14211

Author

jmesquita

Date

2009-07-12 23:29:55 -0500 (Sun, 12 Jul 2009)

Log Message

Yep, still learning and I make mistakes... Order matters

Modified Paths

• freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp
• freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp

Diff

--- freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp	2009-07-13 04:21:31 UTC (rev 14210)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/esl_connection.cpp	2009-07-13 04:29:55 UTC (rev 14211)
@@ -31,18 +31,8 @@
 {
     forever
     {
-        if (connection->connected() && isConnected)
+        if (!connection->connected() && isConnected)
         {
-            /* We should process our event queue here */
-            ESLevent * event = connection->recvEventTimed(10);
-            if (event)
-            {
-                ESLevent * e = new ESLevent(event);
-                emit gotEvent(e);
-            }
-         }
-        else if (!connection->connected() && isConnected)
-        {
             isConnected = false;
             emit gotDisconnected();
         }
@@ -52,6 +42,16 @@
             connection->sendRecv("log 7");
             emit gotConnected();
         }
+        else if (connection->connected() && isConnected)
+        {
+            /* We should process our event queue here */
+            ESLevent * event = connection->recvEventTimed(10);
+            if (event)
+            {
+                ESLevent * e = new ESLevent(event);
+                emit gotEvent(e);
+            }
+         }
         else
         {
             doDisconnect();

--- freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp	2009-07-13 04:21:31 UTC (rev 14210)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fs_gui.cpp	2009-07-13 04:29:55 UTC (rev 14211)
@@ -11,7 +11,7 @@
     m_ui->setupUi(this);
 
     // Set the default status bar message
-    m_ui->statusBar->addPermanentWidget(new QLabel(tr("Ready")),true);
+    m_ui->statusBar->showMessage(tr("Ready"));
 
     connect(m_ui->actionConnect, SIGNAL(triggered())
             , serverDialog, SLOT(show()));