1 files changed, 16 insertions, 12 deletions

diff --git a/noncore/tools/remote/remote.cpp b/noncore/tools/remote/remote.cpp
index 67fc57d..5b756cb 100644
--- a/noncore/tools/remote/remote.cpp
+++ b/noncore/tools/remote/remote.cpp
@@ -40,21 +40,25 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 int main( int argc, char **argv )
 {
     QPEApplication a( argc, argv );
-    MainView w;
-    a.setMainWidget( &w );
-    QPEApplication::showWidget( &w );
     
                 LircHandler lh;
-                if(!lh.isLircdRunning()) {
-                        QMessageBox mb("Error!",
-                                                                                        "Lircd is not running",
-                                                                                        QMessageBox::NoIcon,
-                                                                                        QMessageBox::Ok,
-                                                                                        QMessageBox::NoButton,
-                                                                                        QMessageBox::NoButton);
-                        mb.exec();
                         
+        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);
                 }
                                 
-                return a.exec();
+        MainView w;
+        a.setMainWidget( &w );
+        QPEApplication::showWidget( &w );
+        int result = a.exec();
+        
+        lh.stopLircd();
+        lh.cleanupModules();
+        
+        return result;
 }