Merge pull request #10048 from ctrlaltdavid/open-feed-in-tablet

Open feed in tablet after sharing snapshot from tablet
This commit is contained in:
Seth Alves 2017-03-29 10:08:51 -07:00 committed by GitHub
commit 63ccaee129

View file

@ -33,7 +33,13 @@ function shouldOpenFeedAfterShare() {
return persisted && (persisted !== 'false');
}
function showFeedWindow() {
DialogsManager.showFeed();
if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar"))
|| (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar"))) {
DialogsManager.showFeed();
} else {
tablet.loadQMLSource("TabletAddressDialog.qml");
HMD.openTablet();
}
}
var outstanding;