author | paule <paule> | 2007-02-07 10:31:30 (UTC) |
---|---|---|
committer | paule <paule> | 2007-02-07 10:31:30 (UTC) |
commit | 5f5827b8e28311589e821f199dcefeb964538301 (patch) (unidiff) | |
tree | edb64c2c0d4ab9795e18a95121a63df393ca55bf /noncore/tools/remote/remote.cpp | |
parent | 83d7fd04cc8e1fcafb345f74bc861515e17c5414 (diff) | |
download | opie-5f5827b8e28311589e821f199dcefeb964538301.zip opie-5f5827b8e28311589e821f199dcefeb964538301.tar.gz opie-5f5827b8e28311589e821f199dcefeb964538301.tar.bz2 |
Start up gracefully when lircd is not properly configured yet
Diffstat (limited to 'noncore/tools/remote/remote.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/tools/remote/remote.cpp | 10 |
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 | |||
@@ -43,15 +43,25 @@ int main( int argc, char **argv ) | |||
43 | 43 | ||
44 | LircHandler lh; | 44 | LircHandler lh; |
45 | bool disablelirc = false; | ||
45 | 46 | ||
46 | lh.disableIrDA(); | 47 | lh.disableIrDA(); |
47 | lh.setupModules(); | 48 | lh.setupModules(); |
48 | lh.startLircd(); | 49 | lh.startLircd(); |
50 | |||
51 | if(lh.checkLircdConfValid(false)) { | ||
49 | if(!lh.isLircdRunning()) { | 52 | if(!lh.isLircdRunning()) { |
50 | QMessageBox::critical(NULL, QObject::tr("Error"), | 53 | QMessageBox::critical(NULL, QObject::tr("Error"), |
51 | QObject::tr("Unable to start lircd"), | 54 | QObject::tr("Unable to start lircd"), |
52 | QMessageBox::Ok, QMessageBox::NoButton); | 55 | QMessageBox::Ok, QMessageBox::NoButton); |
56 | disablelirc = true; | ||
57 | } | ||
58 | } | ||
59 | else { | ||
60 | disablelirc = true; | ||
53 | } | 61 | } |
54 | 62 | ||
55 | MainView w; | 63 | MainView w; |
64 | if(!disablelirc) | ||
65 | w.updateLearnTab(); | ||
56 | a.setMainWidget( &w ); | 66 | a.setMainWidget( &w ); |
57 | QPEApplication::showWidget( &w ); | 67 | QPEApplication::showWidget( &w ); |