git.iko.soy/unity8
on xenial help sign in
check for surface before forcing active focus
6dc64cdNick Dedekind
qml/Stages/ApplicationWindow.qml+3−2
compare with xenial
unifiedsplit
@@ -55,7 +55,8 @@ Item {
55 property bool surfaceInitialized: false
55 property bool surfaceInitialized: false
56
56
57 function forceSurfaceActiveFocusIfReady() {
57 function forceSurfaceActiveFocusIfReady() {
58− if (sessionContainer.surface.focus &&
58+ if (sessionContainer.surface !== null &&
59+ sessionContainer.surface.focus &&
59 sessionContainer.surface.parent === sessionContainer.surfaceContainer &&
60 sessionContainer.surface.parent === sessionContainer.surfaceContainer &&
60 sessionContainer.surface.enabled) {
61 sessionContainer.surface.enabled) {
61 sessionContainer.surface.forceActiveFocus();
62 sessionContainer.surface.forceActiveFocus();
@@ -114,10 +115,10 @@ Item {
114 onSurfaceChanged: {
115 onSurfaceChanged: {
115 if (sessionContainer.surface) {
116 if (sessionContainer.surface) {
116 surfaceInitTimer.start();
117 surfaceInitTimer.start();
118+ d.forceSurfaceActiveFocusIfReady();
117 } else {
119 } else {
118 d.surfaceInitialized = false;
120 d.surfaceInitialized = false;
119 }
121 }
120− d.forceSurfaceActiveFocusIfReady();
121 }
122 }
122 }
123 }
123
124