1 files changed, 8 insertions, 11 deletions
diff --git a/src/main_qmladaptor.cpp b/src/main_qmladaptor.cpp
index d75b15c..5fcce5f 100644
--- a/src/main_qmladaptor.cpp
+++ b/src/main_qmladaptor.cpp
@@ -128,7 +128,8 @@ void MainQMLAdaptor::get_web_app_hosts_response(QJsonDocument *doc) {
 
 bool MainQMLAdaptor::setConnectButtonEnabled(bool enabled) {
     // Find item via 'objectName'
-    QQuickItem *item = _engine->rootObjects().at(0)->findChild<QQuickItem*>("start_support_button");
+    QQuickItem *scene_remote_control = _engine->rootObjects().at(0)->findChild<QQuickItem*>("Scene_remote_control");
+    QQuickItem *item = scene_remote_control->findChild<QQuickItem*>("start_support_button");
     if (item) {
         item->setProperty("enabled", enabled);
         if (item->property("checked").toBool()) {
@@ -146,7 +147,8 @@ bool MainQMLAdaptor::setConnectButtonEnabled(bool enabled) {
 
 bool MainQMLAdaptor::setConnectButtonChecked(bool checked) {
     // Find item via 'objectName'
-    QQuickItem *item = _engine->rootObjects().at(0)->findChild<QQuickItem*>("start_support_button");
+    QQuickItem *scene_remote_control = _engine->rootObjects().at(0)->findChild<QQuickItem*>("Scene_remote_control");
+    QQuickItem *item = scene_remote_control->findChild<QQuickItem*>("start_support_button");
     if (item) {
         item->setProperty("checked", checked);
     } else {
@@ -159,7 +161,8 @@ bool MainQMLAdaptor::setConnectButtonChecked(bool checked) {
 
 bool MainQMLAdaptor::setStatus(QString status) {
     // Find item via 'objectName'
-    QQuickItem *item = _engine->rootObjects().at(0)->findChild<QQuickItem*>("dbus_api_status_text");
+    QQuickItem *scene_remote_control = _engine->rootObjects().at(0)->findChild<QQuickItem*>("Scene_remote_control");
+    QQuickItem *item = scene_remote_control->findChild<QQuickItem*>("dbus_api_status_text");
     if (item) {
         item->setProperty("text", status);
     } else {
@@ -203,7 +206,8 @@ bool MainQMLAdaptor::getShowMessageDialog() {
 
 bool MainQMLAdaptor::setStatusIndicator(bool active, QColor color) {
     // Find item via 'objectName'
-    QQuickItem *item = _engine->rootObjects().at(0)->findChild<QQuickItem*>("dbus_api_status_indicator");
+    QQuickItem *scene_remote_control = _engine->rootObjects().at(0)->findChild<QQuickItem*>("Scene_remote_control");
+    QQuickItem *item = scene_remote_control->findChild<QQuickItem*>("dbus_api_status_indicator");
     if (item) {
         item->setProperty("active", active);
         item->setProperty("color", color);
@@ -256,10 +260,3 @@ void MainQMLAdaptor::onCloseHandler() {
 void MainQMLAdaptor::showToast(QString text, uint durationMs) {
     emit showToastSignal(text, QString::number(durationMs));
 }
-
-//void MainQMLAdaptor::onCloseHandler() {
-//    qDebug() << "Inside MainQMLAdaptor::onCloseHandler()";
-
-//    // Sending onClose signal to main and there to Session::onCloseHandler()
-//    emit MainQMLAdaptor::onCloseSignal();
-//}