diff --git a/src/editorapplication.cpp b/src/editorapplication.cpp index daec65d4..ceeb1eb4 100644 --- a/src/editorapplication.cpp +++ b/src/editorapplication.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2019 - 2022 UnionTech Software Technology Co., Ltd. +// SPDX-FileCopyrightText: 2019-2026 UnionTech Software Technology Co., Ltd. // // SPDX-License-Identifier: GPL-3.0-or-later @@ -46,9 +46,9 @@ EditorApplication::~EditorApplication() { qDebug() << "Enter EditorApplication destructor"; // app结束时,释放 - if (nullptr != StartManager::instance()) { + if (nullptr != StartManager::instanceOrNull()) { qDebug() << "Deleting StartManager instance"; - delete StartManager::instance(); + delete StartManager::instanceOrNull(); } else { qDebug() << "StartManager instance is already null"; } diff --git a/src/startmanager.cpp b/src/startmanager.cpp index a5c896be..a62bf8ca 100644 --- a/src/startmanager.cpp +++ b/src/startmanager.cpp @@ -42,6 +42,11 @@ StartManager *StartManager::instance() return m_instance; } +StartManager *StartManager::instanceOrNull() +{ + return m_instance; +} + StartManager::~StartManager() { qDebug() << "Enter StartManager destructor"; diff --git a/src/startmanager.h b/src/startmanager.h index 12dd2a97..e3eb6f48 100644 --- a/src/startmanager.h +++ b/src/startmanager.h @@ -30,6 +30,7 @@ class StartManager : public QObject }; static StartManager *instance(); + static StartManager *instanceOrNull(); explicit StartManager(QObject *parent = nullptr); ~StartManager(); bool checkPath(const QString &file);