Fixed startup and shutdown for application with async event loop

sailfishos · Oct 16, 2014 · 583567c · 583567c
1 parent f8b3cf2
commit 583567c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/embedding/embedlite/embedhelpers/EmbedLiteSubThread.cpp b/embedding/embedlite/embedhelpers/EmbedLiteSubThread.cpp
@@ -41,8 +41,8 @@ void EmbedLiteSubThread::Init()
 void EmbedLiteSubThread::CleanUp()
 {
   LOGT();
-  mApp->StopChildThread();
   profiler_shutdown();
+  mApp->StopChildThread();
 }
 
 bool EmbedLiteSubThread::StartEmbedThread()

diff --git a/embedding/embedlite/tests/qtasync/embedLiteCoreInitTestAsync.cpp b/embedding/embedlite/tests/qtasync/embedLiteCoreInitTestAsync.cpp
@@ -21,16 +21,12 @@ class MyListener : public EmbedLiteAppListener
   virtual ~MyListener() { }
   virtual void Initialized() {
     printf("Embedding initialized\n");
-    mApp->PostTask(&MyListener::StopEmbedding, this);
+    mApp->Stop();
+    printf("Embedding stop finished\n");
   }
   virtual void Destroyed() {
     printf("Embedding  destroyed\n");
-  }
-  static void StopEmbedding(void* aData) {
-    printf("StopEmbedding\n");
-    MyListener* self = static_cast<MyListener*>(aData);
-    self->mApp->Stop();
-    printf("Embedding stop finished\n");
+    qApp->quit();
   }
 
 private:
@@ -53,13 +49,12 @@ int main(int argc, char** argv)
     bool res = mapp->StartWithCustomPump(EmbedLiteApp::EMBED_THREAD, mQtPump->EmbedLoop());
     printf("XUL Symbols loaded: init res:%i\n", res);
     app.exec();
+    delete mQtPump;
     printf("Execution stopped\n");
-    mapp->SetListener(nullptr);
-    printf("Listener is null\n");
     delete listener;
-    printf("Listener destroed\n");
+    printf("Listener destroyed\n");
     delete mapp;
-    printf("App destroed\n");
+    printf("App destroyed\n");
   } else {
     printf("XUL Symbols failed to load\n");
   }

diff --git a/ipc/glue/MessagePump.cpp b/ipc/glue/MessagePump.cpp
@@ -143,7 +143,10 @@ if (did_work && delayed_work_time_.is_null()
 #ifdef MOZ_NUWA_PROCESS
   if (!IsNuwaReady() || !IsNuwaProcess())
 #endif
+  {
     mDelayedWorkTimer->Cancel();
+    mDelayedWorkTimer = nullptr;
+  }
 
   keep_running_ = true;
 }