From 010fa977bbd9c281111d54e6d9ceb802c27b03b9 Mon Sep 17 00:00:00 2001
From: "littletux89@gmail.com" <littletux89@gmail.com>
Date: Wed, 29 May 2019 20:18:32 +0300
Subject: [PATCH] [*] Fixed memory access error when terminating an
application.
---
KelvinDashboardGUI/DapQmlScreenAbout.qml | 4 ++--
KelvinDashboardGUI/main.cpp | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/KelvinDashboardGUI/DapQmlScreenAbout.qml b/KelvinDashboardGUI/DapQmlScreenAbout.qml
index e4b3c9321..da8d3cd29 100755
--- a/KelvinDashboardGUI/DapQmlScreenAbout.qml
+++ b/KelvinDashboardGUI/DapQmlScreenAbout.qml
@@ -6,8 +6,8 @@ import KelvinDashboard 1.0
DapUiQmlScreenAbout {
id: dapQmlScreenAbout
- textTitle.text: DapServiceController.Brand
+ textTitle.text: dapServiceController.Brand
textAbout.text: "KelvinDashboard"
- textVersion.text: "Version " + DapServiceController.Version
+ textVersion.text: "Version " + dapServiceController.Version
textYear.text: new Date().toLocaleDateString(locale, "dd MMM yyyy")
}
diff --git a/KelvinDashboardGUI/main.cpp b/KelvinDashboardGUI/main.cpp
index dce86218e..365d4c173 100755
--- a/KelvinDashboardGUI/main.cpp
+++ b/KelvinDashboardGUI/main.cpp
@@ -52,7 +52,6 @@ int main(int argc, char *argv[])
qmlRegisterType<DapScreenDialog>("KelvinDashboard", 1, 0, "DapScreenDialog");
qmlRegisterType<DapScreenDialogChangeWidget>("KelvinDashboard", 1, 0, "DapScreenDialogChangeWidget");
qmlRegisterType<DapLogMessage>("LogMessage", 1, 0, "DapLogMessage");
- qmlRegisterSingletonType<DapServiceController>("KelvinDashboard", 1, 0, "DapServiceController", DapServiceController::singletonProvider);
qmlRegisterSingletonType<DapUiQmlWidgetModel>("KelvinDashboard", 1, 0, "DapUiQmlWidgetModel", DapUiQmlWidgetModel::singletonProvider);
QQmlApplicationEngine engine;
--
GitLab