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

showMainWidget may not setMainWidget because this would
break Fastloading..

1 files changed, 4 insertions, 5 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 6f2e43b..c7ef2b7 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -732,13 +732,12 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
 }
 
 
 #ifdef QTOPIA_INTERNAL_INITAPP
 void QPEApplication::initApp( int argc, char **argv )
 {
-    bool initial = pidChannel; // was set to 0 in the initializer
     delete pidChannel;
     d->keep_running = TRUE;
     d->preloaded = FALSE;
     d->forceshow = FALSE;
 
     QCString channel = QCString(argv[0]);
@@ -752,16 +751,16 @@ void QPEApplication::initApp( int argc, char **argv )
 
     channel = "QPE/Application/" + channel;
     pidChannel = new QCopChannel( channel, this);
     connect( pidChannel, SIGNAL(received(const QCString &, const QByteArray &)),
             this, SLOT(pidMessage(const QCString &, const QByteArray &)));
 
-    if (!initial) {
+
+
         processQCopFile();
         d->keep_running = d->qcopq.isEmpty();
-    }
 
     for (int a=0; a<argc; a++) {
         if ( qstrcmp(argv[a],"-preload")==0 ) {
             argv[a] = argv[a+1];
             a++;
             d->preloaded = TRUE;
@@ -1568,13 +1567,13 @@ void QPEApplication::pidMessage( const QCString& msg, const QByteArray& data)
   consider passing TRUE for \a nomaximize rather than the default FALSE.
 
   \sa showMainDocumentWidget()
 */
 void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 {
-            setMainWidget(mw);
+        //    setMainWidget(mw); this breaks FastLoading because lastWindowClose() would quit
             d->show(mw, nomaximize );
 }
 
 /*!
   Sets widget \a mw as the mainWidget() and shows it. For small windows,
   consider passing TRUE for \a nomaximize rather than the default FALSE.
@@ -1589,13 +1588,13 @@ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
 void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 {
         if ( mw && argc() == 2 )
                 Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
 
 
-        setMainWidget(mw);
+        //setMainWidget(mw); see above
         d->show(mw, nomaximize );
 }
 
 
 /*!
   If an application is started via a \link qcop.html QCop\endlink