Start up gracefully when lircd is not properly configured yet

1 files changed, 10 insertions, 0 deletions

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();