summaryrefslogtreecommitdiff
path: root/noncore/tools/remote/remote.cpp
Side-by-side diff
Diffstat (limited to 'noncore/tools/remote/remote.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/remote/remote.cpp18
1 files changed, 14 insertions, 4 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
@@ -44,2 +44,3 @@ int main( int argc, char **argv )
LircHandler lh;
+ bool disablelirc = false;
@@ -48,6 +49,13 @@ int main( int argc, char **argv )
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;
}
@@ -55,2 +63,4 @@ int main( int argc, char **argv )
MainView w;
+ if(!disablelirc)
+ w.updateLearnTab();
a.setMainWidget( &w );