on xenial help sign in
Cleanup greeter && shell startup code
commitbf3af57bda5ff5a22f6769e903544af05043cc35 authorJosh Arenson <joshua.arenson@canonical.com> dateFri 22 Jan 2016, 15:26 (11 years ago) parent17f5839
1 file changed+5−3
src/ShellApplication.cpp+5−3
src/ShellApplication.cpp+5−3
@@ -112,11 +112,13 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
112112 }
113113
114114 if (parser.mode().compare("greeter") == 0) {
115− m_shellView->showFullScreen();
116− if (!QProcess::startDetached("/sbin/initctl emit --no-wait unity8-greeter-started")) {
115+ QString upstartCmd = "/sbin/initctl emit --no-wait unity8-greeter-started";
116+ if (!QProcess::startDetached(upstartCmd)) {
117117 qDebug() << "Unable to send unity8-greeter-started event to Upstart";
118118 }
119− } else if (isMirServer || parser.hasFullscreen()) {
119+ }
120+
121+ if (isMirServer || parser.hasFullscreen()) {
120122 m_shellView->showFullScreen();
121123 } else {
122124 m_shellView->show();