summaryrefslogtreecommitdiff
authorpaule <paule>2007-02-07 10:31:30 (UTC)
committer paule <paule>2007-02-07 10:31:30 (UTC)
commit5f5827b8e28311589e821f199dcefeb964538301 (patch) (side-by-side diff)
treeedb64c2c0d4ab9795e18a95121a63df393ca55bf
parent83d7fd04cc8e1fcafb345f74bc861515e17c5414 (diff)
downloadopie-5f5827b8e28311589e821f199dcefeb964538301.zip
opie-5f5827b8e28311589e821f199dcefeb964538301.tar.gz
opie-5f5827b8e28311589e821f199dcefeb964538301.tar.bz2
Start up gracefully when lircd is not properly configured yet
Diffstat (more/less context) (show 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.cpp10
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
@@ -53,2 +53,7 @@ void MainView::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
@@ -44,4 +44,5 @@ public:
public slots:
void updateRemotesList();
+ void updateLearnTab();
private:
RemoteTab *remote;
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
@@ -43,15 +43,25 @@ int main( int argc, char **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 );