also activate discovery if not allready running - makes beaming with s45 easier

2 files changed, 13 insertions, 2 deletions

diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index a5b4bfc..51c2ebf 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -60,2 +60,3 @@ IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
         m_wasOn = false;
+                m_wasDiscover = false;
 
@@ -331,7 +332,16 @@ void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) {
         m_wasOn = checkIrdaStatus();
-        if (!m_wasOn)
+        m_wasDiscover = checkIrdaDiscoveryStatus();
+        if (!m_wasOn)  {
             setIrdaStatus( true );
+        }
+        if ( !m_wasDiscover ) {
+            setIrdaDiscoveryStatus ( true );
+        }
     }else if ( str == "disableIrda()") {
-        if (!m_wasOn)
+        if (!m_wasOn)  {
             setIrdaStatus( false );
+        }
+        if ( !m_wasDiscover ) {
+            setIrdaDiscoveryStatus ( false );
+        }
     }else if ( str == "listDevices()") {
diff --git a/core/applets/irdaapplet/irda.h b/core/applets/irdaapplet/irda.h
index 675f874..ec1d32c 100644
--- a/core/applets/irdaapplet/irda.h
+++ b/core/applets/irdaapplet/irda.h
@@ -71,2 +71,3 @@ private:
         bool m_wasOn; // if IrDa was enabled
+        bool m_wasDiscover;
 };