Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 23:09:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

FB19400 during shutdown -- TypeError: Cannot read property 'buttons'

Browse source
This commit is contained in:
Alexander Ivash 2018-11-17 22:56:59 +05:30
parent b72f462028
commit fe43c733f8
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/Desktop.qml
View file

@ -70,8 +70,8 @@ OriginalDesktop.Desktop {
anchors.horizontalCenter: settings.constrainToolbarToCenterX ? desktop.horizontalCenter : undefined; anchors.horizontalCenter: settings.constrainToolbarToCenterX ? desktop.horizontalCenter : undefined;
// Literal 50 is overwritten by settings from previous session, and sysToolbar.x comes from settings when not constrained. // Literal 50 is overwritten by settings from previous session, and sysToolbar.x comes from settings when not constrained.
x: sysToolbar.x x: sysToolbar.x
buttonModel: tablet.buttons; buttonModel: tablet ? tablet.buttons : null;
shown: tablet.toolbarMode; shown: tablet ? tablet.toolbarMode : false;
} }
Settings { Settings {

4
interface/resources/qml/hifi/tablet/TabletHome.qml
View file

@ -115,9 +115,9 @@ Item {
property int previousIndex: -1 property int previousIndex: -1
Repeater { Repeater {
id: pageRepeater id: pageRepeater
model: Math.ceil(tabletProxy.buttons.rowCount() / TabletEnums.ButtonsOnPage) model: tabletProxy != null ? Math.ceil(tabletProxy.buttons.rowCount() / TabletEnums.ButtonsOnPage) : 0
onItemAdded: { onItemAdded: {
item.proxyModel.sourceModel = tabletProxy.buttons; item.proxyModel.sourceModel = tabletProxy != null ? tabletProxy.buttons : null;
item.proxyModel.pageIndex = index; item.proxyModel.pageIndex = index;
} }