From 505d4fae96e1d6849f119e9b31588f90073a4102 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 21 May 2015 06:01:01 -0500
Subject: in engine-eds.cpp's on_object_list_ready(), always mark the subtask
 as finished even if the dbus call failed.

---
 src/engine-eds.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp
index 37f72e5..8350e77 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -496,6 +496,7 @@ private:
     {
         GError * error = NULL;
         GSList * comps_slist = NULL;
+        auto subtask = static_cast<AppointmentSubtask*>(gsubtask);
 
         if (e_cal_client_get_object_list_as_comps_finish(E_CAL_CLIENT(oclient),
                                                          res,
@@ -511,7 +512,6 @@ private:
                 (ECalComponentAlarmAction)-1
             }; // list of action types to omit, terminated with -1
             GSList * comp_alarms = nullptr;
-            auto subtask = static_cast<AppointmentSubtask*>(gsubtask);
             e_cal_util_generate_alarms_for_list(
                 comps_list,
                 subtask->begin.to_unix(),
@@ -532,7 +532,6 @@ private:
             e_cal_free_alarms(comp_alarms);
             g_list_free(comps_list);
             e_cal_client_free_ecalcomp_slist(comps_slist);
-            delete subtask;
         }
         else if (error != nullptr)
         {
@@ -541,6 +540,8 @@ private:
 
             g_error_free(error);
         }
+
+        delete subtask;
     }
 
     static DateTime
-- 
cgit v1.2.3