Check lircd is configured before accepting button presses

1 files changed, 5 insertions, 1 deletions

diff --git a/noncore/tools/remote/remotetab.cpp b/noncore/tools/remote/remotetab.cpp
index c89d8c2..065feac 100644
--- a/noncore/tools/remote/remotetab.cpp
+++ b/noncore/tools/remote/remotetab.cpp
@@ -38,45 +38,49 @@ RemoteTab::RemoteTab(QWidget *parent, const char *name):QWidget(parent,name)
 
 	vcrGroup = new VCRGroup(this);
 	layout->addWidget(vcrGroup, 0, 0);
 //	vcrGroup->setMaximumHeight(45);
 
 	layout->addSpacing(1);
 
 	channelGroup = new ChannelGroup(this);
 //	channelGroup->setMaximumHeight(91);
 	layout->addWidget(channelGroup, 0, 0);
 
 	this->setMaximumWidth(240);
 }
 
 int RemoteTab::sendIR()
 {
+	LircHandler lh;
+	
+	if(!lh.checkLircdConfValid(false))
+		return 0;
+	
 	QString curr_remote = topGroup->getRemotesText();
 	if(curr_remote != "")
 		cfg->setGroup(curr_remote);
 	else {
 		QMessageBox::warning(this, tr("Error"), tr("Please select or create\na remote layout"), QMessageBox::Ok, QMessageBox::NoButton);
 		return 0;
 	}
 	
 	const QObject *button = sender();
 	QString string = cfg->readEntry(button->name());
 	if(string != "") {
 		string+='\n';
-		LircHandler lh;
 		return lh.sendIR(string.latin1());
 	}
 	else {
 		QMessageBox::warning(this, tr("Error"), tr("This button has not\nbeen configured"), QMessageBox::Ok, QMessageBox::NoButton);
 		return 0;
 	}
 }
 
 void RemoteTab::setConfig(Config *newCfg)
 {
 	cfg = newCfg;
 	cfg->setGroup("Remotes");
 	topGroup->updateRemotes(cfg);
 	
 	QString curr_remote = topGroup->getRemotesText();
 	if(curr_remote != "")