author | paule <paule> | 2007-02-07 10:31:30 (UTC) |
---|---|---|
committer | paule <paule> | 2007-02-07 10:31:30 (UTC) |
commit | 5f5827b8e28311589e821f199dcefeb964538301 (patch) (side-by-side diff) | |
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) (ignore whitespace changes)
-rw-r--r-- | noncore/tools/remote/remote.cpp | 18 |
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 @@ -1,64 +1,74 @@ /* Opie-Remote. emulates remote controlls on an iPaq (and maybe a Zaurus) in Opie. Copyright (C) 2002 Thomas Stephens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "mainview.h" /* OPIE */ #include <qpe/qpeapplication.h> #include <qpe/config.h> /* QT */ #include <qpushbutton.h> #include <qtabwidget.h> #include <qlayout.h> #include <qmessagebox.h> #include <qpaintdevice.h> #include <qobject.h> /* STD */ #include <sys/socket.h> #include <sys/types.h> #include <sys/un.h> #include <unistd.h> #include <stdio.h> #include <signal.h> int main( int argc, char **argv ) { QPEApplication a( argc, argv ); LircHandler lh; + bool disablelirc = false; lh.disableIrDA(); lh.setupModules(); 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; } MainView w; + if(!disablelirc) + w.updateLearnTab(); a.setMainWidget( &w ); QPEApplication::showWidget( &w ); int result = a.exec(); lh.stopLircd(); lh.cleanupModules(); return result; } |