summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/remote/mainview.cpp5
-rw-r--r--noncore/tools/remote/mainview.h1
-rw-r--r--noncore/tools/remote/remote.cpp18
3 files changed, 20 insertions, 4 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
@@ -54 +54,6 @@ void MainView::updateRemotesList()
}
+
+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
@@ -45,2 +45,3 @@ public slots:
void updateRemotesList();
+ void updateLearnTab();
private:
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 );