Start up gracefully when lircd is not properly configured yet

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
@@ -43,12 +43,17 @@ MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name)
 	cfg = new Config("Remote");
 	printf("2\n");
 
 	remote->setConfig(cfg);
 	config->setConfig(cfg);
 }
 
 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
@@ -34,19 +34,20 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "configtab.h"
 #include "helptab.h"
 
 #define BUFFERSIZE 256
 
 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
@@ -33,32 +33,42 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <sys/types.h>
 #include <sys/un.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <signal.h>
 
 
 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();
 	
 	lh.stopLircd();
 	lh.cleanupModules();
 	
 	return result;
 }