3 files changed, 16 insertions, 0 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
@@ -52,3 +52,8 @@ 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
@@ -43,6 +43,7 @@ public:
         MainView(QWidget *parent=0, const char *name=0);
 public slots:
         void updateRemotesList();
+        void updateLearnTab();
 private:
         RemoteTab *remote;
         ConfigTab *config;
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
@@ -42,17 +42,27 @@ int main( int argc, char **argv )
         QPEApplication a( argc, argv );
         
         LircHandler lh;
+        bool disablelirc = false;
         
         lh.disableIrDA();
         lh.setupModules();
         lh.startLircd();
+        
+        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();