|
 |
efdeb20 |
From 18615d02971d6555d3720214fb6875f5bf582730 Mon Sep 17 00:00:00 2001
|
|
|
efdeb20 |
From: Tim Klocke <taaem@mailbox.org>
|
|
|
efdeb20 |
Date: Fri, 10 Apr 2020 19:03:15 +0200
|
|
|
efdeb20 |
Subject: [PATCH] CloudProviders: Don't clear the _recentMenu pointer
|
|
|
efdeb20 |
|
|
|
efdeb20 |
The _recentMenu pointer ref should not be freed, when building the
|
|
|
efdeb20 |
menu.
|
|
|
efdeb20 |
This fixes #1920 and #1818
|
|
|
efdeb20 |
---
|
|
|
efdeb20 |
src/gui/cloudproviders/cloudproviderwrapper.cpp | 2 +-
|
|
|
efdeb20 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
efdeb20 |
|
|
|
efdeb20 |
diff --git a/src/gui/cloudproviders/cloudproviderwrapper.cpp b/src/gui/cloudproviders/cloudproviderwrapper.cpp
|
|
|
efdeb20 |
index f4e2a7606..421ae625a 100644
|
|
|
efdeb20 |
--- a/src/gui/cloudproviders/cloudproviderwrapper.cpp
|
|
|
efdeb20 |
+++ b/src/gui/cloudproviders/cloudproviderwrapper.cpp
|
|
|
efdeb20 |
@@ -69,6 +69,7 @@ CloudProviderWrapper::~CloudProviderWrapper()
|
|
|
efdeb20 |
g_object_unref(_cloudProviderAccount);
|
|
|
efdeb20 |
g_object_unref(_mainMenu);
|
|
|
efdeb20 |
g_object_unref(actionGroup);
|
|
|
efdeb20 |
+ g_object_unref(_recentMenu);
|
|
|
efdeb20 |
}
|
|
|
efdeb20 |
|
|
|
efdeb20 |
CloudProvidersAccountExporter* CloudProviderWrapper::accountExporter()
|
|
|
efdeb20 |
@@ -258,7 +259,6 @@ GMenuModel* CloudProviderWrapper::getMenuModel() {
|
|
|
efdeb20 |
g_menu_append_section(_mainMenu, nullptr, G_MENU_MODEL(section));
|
|
|
efdeb20 |
g_clear_object (§ion);
|
|
|
efdeb20 |
|
|
|
efdeb20 |
- g_clear_object (&_recentMenu);
|
|
|
efdeb20 |
return G_MENU_MODEL(_mainMenu);
|
|
|
efdeb20 |
}
|
|
|
efdeb20 |
|
|
|
efdeb20 |
--
|
|
|
efdeb20 |
2.26.0
|
|
|
efdeb20 |
|