Merge lp://staging/~jeremywootten/pantheon-files/fix-1625290-crash-on-reenter-directory-init into lp://staging/~elementary-apps/pantheon-files/trunk

Proposed by Jeremy Wootten
Status: Merged
Approved by: Cody Garver
Approved revision: 2326
Merged at revision: 2338
Proposed branch: lp://staging/~jeremywootten/pantheon-files/fix-1625290-crash-on-reenter-directory-init
Merge into: lp://staging/~elementary-apps/pantheon-files/trunk
Diff against target: 16 lines (+5/-1)
1 file modified
src/View/Slot.vala (+5/-1)
To merge this branch: bzr merge lp://staging/~jeremywootten/pantheon-files/fix-1625290-crash-on-reenter-directory-init
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+306382@code.staging.launchpad.net

Commit message

Remove assertion that Slot.directory_initialize should not be reentered while the directory is loading - this can happen when multiple duplicate tabs are being restored (lp:1625290)

Description of the change

Remove assertion that Slot.directory_initialize should not be reentered while the directory is loading - this can happen when multiple duplicate tabs are being restored. Instead just ignore and return.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: