From 442ba9f09a8ee18609361f3971b5da7f40eb5c35 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Tue, 10 Oct 2017 19:25:44 +0200
Subject: Split off DownloadsWidget into library

Fixed bug with BookmarksWidget crashing the program on exit
---
 src/browser.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'src/browser.cpp')

diff --git a/src/browser.cpp b/src/browser.cpp
index c0289a6..14fee3e 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -42,14 +42,6 @@ Browser::~Browser()
 {
     qDeleteAll(m_windows);
     m_windows.clear();
-
-    if(m_bookmarksManager) {
-        delete m_bookmarksManager;
-    }
-
-    if(m_downloadManager) {
-        delete m_downloadManager;
-    }
 }
 
 QString Browser::applicationLongVersion() const
@@ -126,17 +118,17 @@ Settings *Browser::settings()
 BookmarksWidget *Browser::bookmarks()
 {
     if(!m_bookmarksManager) {
-        m_bookmarksManager = new BookmarksWidget(settings()->value("bookmarks.path").toString());
+        m_bookmarksManager = QSharedPointer<BookmarksWidget>(new BookmarksWidget(settings()->value("bookmarks.path").toString()), &QObject::deleteLater);
     }
-    return m_bookmarksManager;
+    return m_bookmarksManager.data();
 }
 
 DownloadsWidget *Browser::downloads()
 {
     if(!m_downloadManager) {
-        m_downloadManager = new DownloadsWidget();
+        m_downloadManager = QSharedPointer<DownloadsWidget>(new DownloadsWidget(settings()->value("downloads.path").toString()), &QObject::deleteLater);
     }
-    return m_downloadManager;
+    return m_downloadManager.data();
 }
 
 BlockerManager *Browser::blocklists()
-- 
cgit v1.2.1