cpp/openttd-patchpack/source Changeset - r1038:e82e63054869

Changeset - r1038:e82e63054869

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

darkvater - 20 years ago 2005-01-16 12:30:52
darkvater@openttd.org

(svn r1539) -Fix: [1103271] free'd memory used. Moved w->wndproc(w, &e) to end of function. Thanks for finding this tamlin.

1 file changed with 11 insertions and 15 deletions:

window.c

0 comments (0 inline, 0 general)

window.c

➞

Show inline comments

@@ @@ -48,31 +48,27 @@ void DispatchLeftClickEvent(Window *w, i @@
 			ScrollbarClickHandler(w, wi, e.click.pt.x, e.click.pt.y);
+		}
 		w->wndproc(w, &e);
 		if (w->desc_flags & WDF_STD_BTN) {
 			if (e.click.widget == 0) {
+			if (e.click.widget == 0) { /* 'X' */
 				DeleteWindow(w);
 				return;
 			} else {
 				if (e.click.widget == 1) {
 					StartWindowDrag(w);
+				}
+			}
+			}
 			if (e.click.widget == 1) /* 'Title bar' */
 				StartWindowDrag(w);
+		}
-		if (w->desc_flags & WDF_RESIZABLE && wi->type == WWT_RESIZEBOX) {
 		if (w->desc_flags & WDF_RESIZABLE && wi->type == WWT_RESIZEBOX)
 			StartWindowSizing(w);
+		}
 		if (w->desc_flags & WDF_STICKY_BUTTON && wi->type == WWT_STICKYBOX) {
-			w->click_state ^= (1 << e.click.widget);
+			TOGGLEBIT(w->click_state, e.click.widget);
 			w->flags4 ^= WF_STICKY;
 			InvalidateWidget(w, e.click.widget);
+		}
 	} else {
 		w->wndproc(w, &e);
+	}
 	w->wndproc(w, &e);
+}
 void DispatchRightClickEvent(Window *w, int x, int y) {
@@ @@ -771,14 +767,14 @@ static bool HandlePopupMenu() @@
 	if (_left_button_down) {
 		e.event = WE_POPUPMENU_OVER;
 		e.popupmenu.pt = _cursor.pos;
 		w->wndproc(w, &e);
 	} else {
 		_popup_menu_active = false;
 		e.event = WE_POPUPMENU_SELECT;
 		e.popupmenu.pt = _cursor.pos;
 		w->wndproc(w, &e);
+	}
 	w->wndproc(w, &e);
 	return false;
+}

0 comments (0 inline, 0 general)