Merge branch 'rochade' into master
[alioth/musescore.git] / debian / patches / upstream / crash-del-hbox.diff
1 Origin: upstream, commit:24e239ed74770e24d2981883d5d435302735567a
2 Author: Dmitri Ovodok <dmitrio95@yandex.ru>
3 Description: Fix a crash on removing HBox from a score
4
5 --- a/libmscore/box.cpp
6 +++ b/libmscore/box.cpp
7 @@ -457,9 +457,12 @@ void HBox::layout()
8              setPos(x, y);
9              bbox().setRect(0.0, 0.0, w, h);
10              }
11 -      else {
12 +      else if (system()) {
13              bbox().setRect(0.0, 0.0, point(boxWidth()), system()->height());
14              }
15 +      else {
16 +            bbox().setRect(0.0, 0.0, 50, 50);
17 +            }
18        Box::layout();
19        }
20