qtubuntu

Merge lp:~aacid/qtubuntu/fix_crash_starting_konsole into lp:qtubuntu

  1. fix_crash_starting_konsole
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Nick Dedekind
Approved revision: 379
Merged at revision: 369
Proposed branch: lp:~aacid/qtubuntu/fix_crash_starting_konsole
Merge into: lp:qtubuntu
Prerequisite: lp:~artmello/qtubuntu/qtubuntu-new_mir_api
Diff against target: 14 lines (+5/-0)
1 file modified
src/ubuntuappmenu/gmenumodelplatformmenu.cpp (+5/-0)
To merge this branch: bzr merge lp:~aacid/qtubuntu/fix_crash_starting_konsole
Reviewer Review Type Date Requested Status
Nick Dedekind (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+317124@code.launchpad.net

Commit message

Fix crash when starting konsole

If Qt deletes the menu, reset the variable where we hold it to null.

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:379
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/178/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4092
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4120
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3960
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3960/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3960
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3960/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3960
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3960/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3960
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3960/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3960
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3960/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3960
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3960/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/178/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

Looks ok.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntuappmenu/gmenumodelplatformmenu.cpp'
2--- src/ubuntuappmenu/gmenumodelplatformmenu.cpp 2016-12-09 17:04:05 +0000
3+++ src/ubuntuappmenu/gmenumodelplatformmenu.cpp 2017-02-13 16:12:55 +0000
4@@ -499,6 +499,11 @@
5 if (m_menu != menu) {
6 m_menu = menu;
7 Q_EMIT propertyChanged();
8+
9+ if (menu) {
10+ connect(menu, &QObject::destroyed,
11+ this, [this] { setMenu(nullptr); });
12+ }
13 }
14 }
15

Subscribers

People subscribed via source and target branches