[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-workspace] ksplash/ksplashqml: Wait for all 7 stages of startup not just 6
From:       David Edmundson <kde () davidedmundson ! co ! uk>
Date:       2014-06-04 15:33:09
Message-ID: E1WsDBd-0007Hl-A3 () scm ! kde ! org
[Download RAW message or body]

Git commit ae73547fe51c793100faed658edf564ac7699cfe by David Edmundson.
Committed on 04/06/2014 at 15:33.
Pushed by davidedmundson into branch 'master'.

Wait for all 7 stages of startup not just 6

M  +12   -1    ksplash/ksplashqml/SplashApp.cpp

http://commits.kde.org/plasma-workspace/ae73547fe51c793100faed658edf564ac7699cfe

diff --git a/ksplash/ksplashqml/SplashApp.cpp b/ksplash/ksplashqml/SplashApp.cpp
index 714806d..dabc38a 100644
--- a/ksplash/ksplashqml/SplashApp.cpp
+++ b/ksplash/ksplashqml/SplashApp.cpp
@@ -28,6 +28,17 @@
 
 #define TEST_STEP_INTERVAL 2000
 
+/**
+ * There are 7 stages in ksplash
+ *  - initial
+ *  - kded
+ *  - confupdate
+ *  - ksmserver
+ *  - wm
+ *  - ready
+ *  - desktop
+ */
+
 SplashApp::SplashApp(int &argc, char ** argv)
     : QApplication(argc, argv),
       m_stage(0),
@@ -84,7 +95,7 @@ void SplashApp::setStage(const QString &stage)
 
 void SplashApp::setStage(int stage)
 {
-    if (m_stage == 6) {
+    if (m_stage == 7) {
         QApplication::exit(EXIT_SUCCESS);
     }
 

[prev in list] [next in list] [prev in thread] [next in thread]