Start up gracefully when lircd is not properly configured yet

3 files changed, 20 insertions, 4 deletions

diff --git a/noncore/tools/remote/mainview.cpp b/noncore/tools/remote/mainview.cpp
index 8c87785..a00a75a 100644
--- a/noncore/tools/remote/mainview.cpp
+++ b/noncore/tools/remote/mainview.cpp
@@ -49,6 +49,11 @@ MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name)
 
 void MainView::updateRemotesList()
 {
         remote->updateRemotesList();
         printf("MainView: got remotes changed signal\n");
 }
+
+void MainView::updateLearnTab()
+{
+        learn->updateRemotesList();
+}
diff --git a/noncore/tools/remote/mainview.h b/noncore/tools/remote/mainview.h
index b1ddde4..26b8086 100644
--- a/noncore/tools/remote/mainview.h
+++ b/noncore/tools/remote/mainview.h
@@ -40,12 +40,13 @@ class MainView : public QWidget
 {
         Q_OBJECT
 public:
         MainView(QWidget *parent=0, const char *name=0);
 public slots:
         void updateRemotesList();
+        void updateLearnTab();
 private:
         RemoteTab *remote;
         ConfigTab *config;
         LearnTab *learn;
         HelpTab *help;
         Config *cfg;
diff --git a/noncore/tools/remote/remote.cpp b/noncore/tools/remote/remote.cpp
index 5b756cb..03d70c4 100644
--- a/noncore/tools/remote/remote.cpp
+++ b/noncore/tools/remote/remote.cpp
@@ -39,23 +39,33 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 int main( int argc, char **argv )
 {
         QPEApplication a( argc, argv );
         
         LircHandler lh;
+        bool disablelirc = false;
         
         lh.disableIrDA();
         lh.setupModules();
         lh.startLircd();
-        if(!lh.isLircdRunning()) {
-                QMessageBox::critical(NULL, QObject::tr("Error"),
-                                QObject::tr("Unable to start lircd"),
-                                QMessageBox::Ok, QMessageBox::NoButton);
+        
+        if(lh.checkLircdConfValid(false)) {
+                if(!lh.isLircdRunning()) {
+                        QMessageBox::critical(NULL, QObject::tr("Error"),
+                                        QObject::tr("Unable to start lircd"),
+                                        QMessageBox::Ok, QMessageBox::NoButton);
+                        disablelirc = true;
+                }
+        }
+        else {
+                disablelirc = true;
         }
         
         MainView w;
+        if(!disablelirc)
+                w.updateLearnTab();
         a.setMainWidget( &w );
         QPEApplication::showWidget( &w );
         int result = a.exec();
         
         lh.stopLircd();
         lh.cleanupModules();