File fix-qlist-error.patch of Package deepin-control-center

Overview Repositories Revisions Requests Users Attributes Meta

File fix-qlist-error.patch of Package deepin-control-center (Revision 86660023f776aad8e741d82ea34837e5)

Currently displaying revision 86660023f776aad8e741d82ea34837e5 , Show latest

From 164661b4f63239318ee6088bc3b1dad4a441a346 Mon Sep 17 00:00:00 2001
From: chenhongtao <chenhongtao@deepin.org>
Date: Tue, 6 Jun 2023 10:25:30 +0800
Subject: [PATCH] fix(coredump): coredump on opensuse

it seems create a QList before into main function, with some cmake
variables, the d pointer will be nullptr, so now use a function to
create a new qlist when first start to solve the problem

Log:
---
 src/widgets/accessibleinterface.cpp | 35 +++++++++++++++++------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/widgets/accessibleinterface.cpp b/src/widgets/accessibleinterface.cpp
index 1073e2c577..d422753106 100644
--- a/src/widgets/accessibleinterface.cpp
+++ b/src/widgets/accessibleinterface.cpp
@@ -1,37 +1,44 @@
-//SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2023 UnionTech Software Technology Co., Ltd.
 //
-//SPDX-License-Identifier: GPL-3.0-or-later
+// SPDX-License-Identifier: GPL-3.0-or-later
 #include "widgets/accessibleinterface.h"
+
 #include "accessiblefactoryinterface.h"
+
 #include <QList>
 
 static AccessibleFactoryInterface *s_accessibleFactoryInterface = nullptr;
-static QList<QPair<QString,AccessibleFactoryBase *>> s_cacheFactory;
 
-AccessibleFactoryBase * AccessibleFactoryManager::RegisterAccessibleFactory(const char *factoryName,AccessibleFactoryBase *factory)
+auto &get_cacheFactor()
+{
+    static QList<QPair<QString, AccessibleFactoryBase *>> s_cacheFactory;
+    return s_cacheFactory;
+}
+
+AccessibleFactoryBase *AccessibleFactoryManager::RegisterAccessibleFactory(
+        const char *factoryName, AccessibleFactoryBase *factory)
 {
     if (s_accessibleFactoryInterface) {
         s_accessibleFactoryInterface->registerAccessibleFactory(factoryName, factory);
     } else {
-        s_cacheFactory.append({factoryName,factory});
+        auto &s_cacheFactory = get_cacheFactor();
+        s_cacheFactory.append({ factoryName, factory });
     }
     return factory;
 }
 
-AccessibleFactoryInterface::AccessibleFactoryInterface()
-{
-}
+AccessibleFactoryInterface::AccessibleFactoryInterface() { }
 
-AccessibleFactoryInterface::~AccessibleFactoryInterface()
-{
-}
+AccessibleFactoryInterface::~AccessibleFactoryInterface() { }
 
 void AccessibleFactoryInterface::RegisterInstance(AccessibleFactoryInterface *inter)
 {
-    if(!s_accessibleFactoryInterface) {
+    if (!s_accessibleFactoryInterface) {
+        auto &s_cacheFactory = get_cacheFactor();
         s_accessibleFactoryInterface = inter;
-        for (auto &&factory:s_cacheFactory) {
-            s_accessibleFactoryInterface->registerAccessibleFactory(factory.first.toLatin1().data(),factory.second);
+        for (auto &&factory : s_cacheFactory) {
+            s_accessibleFactoryInterface->registerAccessibleFactory(factory.first.toLatin1().data(),
+                                                                    factory.second);
         }
         s_cacheFactory.clear();
     }

Places

File fix-qlist-error.patch of Package deepin-control-center (Revision 86660023f776aad8e741d82ea34837e5)

Places