Merge lp://qastaging/~midori/midori/inactivity-reset-fix into lp://qastaging/midori
Proposed by
Paweł Forysiuk
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Cris Dywan | ||||
| Approved revision: | 6977 | ||||
| Merged at revision: | 6983 | ||||
| Proposed branch: | lp://qastaging/~midori/midori/inactivity-reset-fix | ||||
| Merge into: | lp://qastaging/midori | ||||
| Diff against target: |
24 lines (+3/-0) 2 files modified
katze/midori-paths.vala (+1/-0) midori/midori-frontend.c (+2/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~midori/midori/inactivity-reset-fix | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cris Dywan | Approve | ||
|
Review via email:
|
|||
Commit message
Fix assert when resetting webapp state after inactivity reset
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
Looks good.
For the record, we should really be replacing the pseudo 'stock' extension code with something less error-prone, but this fixes the immediate issues.