fix drag handle segv, new app icons

[goodguy/history.git] / cinelerra-5.1 / cinelerra / apatchgui.C

diff --git a/cinelerra-5.1/cinelerra/apatchgui.C b/cinelerra-5.1/cinelerra/apatchgui.C
index f41959acfd7824f20834129e5dafd54eea71aa4a..abfe57cd963998384c462cdc45bd11bee559a070 100644 (file)
--- a/cinelerra-5.1/cinelerra/apatchgui.C
+++ b/cinelerra-5.1/cinelerra/apatchgui.C
@@ -115,8 +115,7 @@ int APatchGUI::update(int x, int y)
                patchbay->add_subwindow(fade = new AFadePatch(mwindow, this, x1+x, y1+y,
                        patchbay->get_w() - 10));
        }
-       if( fade )
-               y1 = y2;
+       y1 = y2;
 
        y2 = y1 + mwindow->theme->meter_h;
        if( meter ) {
@@ -127,8 +126,7 @@ int APatchGUI::update(int x, int y)
        else if( h >= y2 ) {
                patchbay->add_subwindow(meter = new AMeterPatch(mwindow, this, x1+x, y1+y));
        }
-       if( meter )
-               y1 = y2;
+       y1 = y2;
 
        y2 = y1 + mwindow->theme->pan_h;
        if( pan ) {
@@ -168,8 +166,7 @@ int APatchGUI::update(int x, int y)
                patchbay->add_subwindow(nudge = new NudgePatch(mwindow, this, x1+x, y1+y,
                                patchbay->get_w() - x1-x - 10));
        }
-       if( pan )
-               y1 = y2;
+       y1 = y2;
 
        return y1;
 }