Merge pull request #9859 from druiz17/tablet-blankscreenv2

force tablet on to home screen option
This commit is contained in:
Seth Alves 2017-03-10 12:49:52 -08:00 committed by GitHub
commit 7e7b3e040e

View file

@ -393,7 +393,7 @@ void TabletProxy::popFromStack() {
}
void TabletProxy::loadHomeScreen(bool forceOntoHomeScreen) {
if (_state != State::Home && ( _state != State::Uninitialized || forceOntoHomeScreen)) {
if ((_state != State::Home && _state != State::Uninitialized) || forceOntoHomeScreen) {
if (!_toolbarMode && _qmlTabletRoot) {
auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen()), Qt::DirectConnection);