diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-12-18 12:01:36 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2021-02-06 10:00:39 -0800 |
commit | 64dae43bddf2894f0891b56e5f419e325309a66f (patch) | |
tree | 07fd968cfdf199483ea69db0d87610b4e1ab4615 /desktop-widgets/mapwidget.cpp | |
parent | 8a36a100ce073decb5cb236efbd7c4ce93f5abc2 (diff) | |
download | subsurface-64dae43bddf2894f0891b56e5f419e325309a66f.tar.gz |
desktop: do own memory management of quadrant widgets
The memory management of the quadrant widgets is a total mess:
When setting the widget, the QSplitters take ownership, which
means that they will delete the widget in their destructor.
This is inherently incompatible with singletons, which must
not be deleted.
To avoid all these troubles, remove the widgets from the
QSplitters in the desctructor of the MainWindow. This of
course means that we now have to take care about deletion
of the widgets.
For local widgets use std::unique_ptr, for singletons use
a static variable that is deleted on application exit.
Sadly, for the map widget we can't use a normal singleton,
because the QML MapWidget's memory management is buggy.
Add a comment in the source code explaining this.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/mapwidget.cpp')
-rw-r--r-- | desktop-widgets/mapwidget.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/desktop-widgets/mapwidget.cpp b/desktop-widgets/mapwidget.cpp index 2d23f0916..9ba77268a 100644 --- a/desktop-widgets/mapwidget.cpp +++ b/desktop-widgets/mapwidget.cpp @@ -116,6 +116,15 @@ void MapWidget::divesChanged(const QVector<dive *> &, DiveField field) reload(); } +// Sadly, for reasons out of our control, we can't use a normal singleton for the +// map widget: In a standard singleton, the object is freed after main() exits. +// However, if there is an animation running (map zooming), the thread is +// terminated, when the QApplication object is destroyed, which is before main() +// exits. The thread has a QQmlAnimationTimer that is freed. However, the map widget +// then tries to free the object itself, leading to a crash. Clearly, a bug in +// the QML MapWidget / QtQuick ecosystem. +// To solve this, the mainwindow will destroy the map widget and in the destructor +// the reference is cleared. Sad. MapWidget::~MapWidget() { m_instance = NULL; |