summaryrefslogtreecommitdiffstats
path: root/android-mobile
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-05-16 22:50:24 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-05-17 07:22:04 -0700
commitf54268e527764dac4893ad68703a7fa67c2d1ecb (patch)
treecaf7c70f76036e3cf1984772f2157ca7fa3616b8 /android-mobile
parentafe88435094fbb1aa179baab5e2e16249258851a (diff)
downloadsubsurface-f54268e527764dac4893ad68703a7fa67c2d1ecb.tar.gz
Dive pictures: Fix crash on picture delete
The recent simplification of the close button code introduced a crash: Deletion of pictures caused an invalid memory access, because the CloseButtonItem was deleted with the parent DivePicture item. For some (not fully understood!) reason, a reference to this button was stored in the depths of Qt. Empirically, it was found out that removing the first line of the pair QGraphicsItem::mousePressEvent(event); emit clicked(); fixed the crash. It seemed therefore prudent to remove the whole questionable signal/slot mechanism and directly call the removePicture() function of the parent. Thus, the intermediate DiveButtonItem class became unnecessary and was removed, leading to a shallower class hierarchy. Unfortunately, CloseButtonItem must still be derived from QObject owing to the Q_PROPERTY machinery, which is in turn needed for animation. To make this compile on mobile, the conditional compilation of removePicture() (#ifndef SUBSURFACE_MOBILE) was removed. After all, if DivePixmapItem is used, there are pictures, so removePicture() should be functional. Conditional compilation should concern the whole class, not only this function. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'android-mobile')
0 files changed, 0 insertions, 0 deletions