Merge pull request #11099 from druiz17/bug-blank-tablet-switch

fix blank tablet when switching between HMD and Desktop mode quickly
This commit is contained in:
Seth Alves 2017-08-02 10:09:56 -07:00 committed by GitHub
commit 728e7fb253

View file

@ -228,7 +228,12 @@ void TabletProxy::setToolbarMode(bool toolbarMode) {
connect(tabletRootWindow, &QmlWindowClass::fromQml, this, &TabletProxy::fromQml);
} else {
removeButtonsFromToolbar();
addButtonsToHomeScreen();
if (_currentPathLoaded == TABLET_SOURCE_URL) {
addButtonsToHomeScreen();
} else {
loadHomeScreen(true);
}
// destroy desktop window
if (_desktopWindow) {
@ -236,7 +241,6 @@ void TabletProxy::setToolbarMode(bool toolbarMode) {
_desktopWindow = nullptr;
}
}
loadHomeScreen(true);
emit screenChanged(QVariant("Home"), QVariant(TABLET_SOURCE_URL));
}