Merge branch 'avoid_unnecessary_instantiation' into 'master'

[nemo-qml-plugin-calendar] Avoid unnecessary instantiation of calendar manager.… See merge request mer-core/nemo-qml-plugin-calendar!29
sailfishos · Nov 20, 2018 · 3890a38 · 3890a38
2 parents 0e30efe + b8a0a69
commit 3890a38
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/calendarinvitationquery.cpp b/src/calendarinvitationquery.cpp
@@ -44,7 +44,10 @@ NemoCalendarInvitationQuery::NemoCalendarInvitationQuery()
 
 NemoCalendarInvitationQuery::~NemoCalendarInvitationQuery()
 {
-    NemoCalendarManager::instance()->unRegisterInvitationQuery(this);
+    NemoCalendarManager *manager = NemoCalendarManager::instance(false);
+    if (manager) {
+        manager->unRegisterInvitationQuery(this);
+    }
 }
 
 QString NemoCalendarInvitationQuery::notebookUid() const

diff --git a/src/calendarmanager.cpp b/src/calendarmanager.cpp
@@ -98,10 +98,10 @@ NemoCalendarManager::NemoCalendarManager() :
     connect(mTimer, SIGNAL(timeout()), this, SLOT(timeout()));
 }
 
-NemoCalendarManager *NemoCalendarManager::instance()
+NemoCalendarManager *NemoCalendarManager::instance(bool createIfNeeded)
 {
     static NemoCalendarManager *managerInstance;
-    if (!managerInstance)
+    if (!managerInstance && createIfNeeded)
         managerInstance = new NemoCalendarManager;
 
     return managerInstance;

diff --git a/src/calendarmanager.h b/src/calendarmanager.h
@@ -59,7 +59,7 @@ class NemoCalendarManager : public QObject
     NemoCalendarManager();
 
 public:
-    static NemoCalendarManager *instance();
+    static NemoCalendarManager *instance(bool createIfNeeded = true);
     ~NemoCalendarManager();
 
     NemoCalendarEvent* eventObject(const QString &eventUid, const KDateTime &recurrenceId);