Unbreak fastloading. So the API Documentation is a lie..

showMainWidget may not setMainWidget because this would
break Fastloading..

1 files changed, 7 insertions, 8 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 6f2e43b..c7ef2b7 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -437,5 +437,5 @@ static void setTreble( int t = 0, int percent = -1 )
 
 /**
-  \class QPEApplication 
+  \class QPEApplication
   \brief The QPEApplication class implements various system services
     that are available to all Qtopia applications.
@@ -736,5 +736,4 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 void QPEApplication::initApp( int argc, char **argv )
 {
-    bool initial = pidChannel; // was set to 0 in the initializer
     delete pidChannel;
     d->keep_running = TRUE;
@@ -756,8 +755,8 @@ void QPEApplication::initApp( int argc, char **argv )
             this, SLOT(pidMessage(const QCString &, const QByteArray &)));
 
-    if (!initial) {
-        processQCopFile();
-        d->keep_running = d->qcopq.isEmpty();
-    }
+
+
+    processQCopFile();
+    d->keep_running = d->qcopq.isEmpty();
 
     for (int a=0; a<argc; a++) {
@@ -1572,5 +1571,5 @@ void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
 void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 {
-            setMainWidget(mw);
+        //    setMainWidget(mw); this breaks FastLoading because lastWindowClose() would quit
             d->show(mw, nomaximize );
 }
@@ -1593,5 +1592,5 @@ void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 
 
-        setMainWidget(mw);
+        //setMainWidget(mw); see above
         d->show(mw, nomaximize );
 }