From dd8b36fb16c410798e5a238871f5eb318bf10191 Mon Sep 17 00:00:00 2001 From: "Ignacio R. Morelle" Date: Thu, 4 Jun 2015 22:59:46 -0300 Subject: [PATCH] gui2/teditor_edit_side: Make controller_num ctor parameter a reference This eliminates the stack corruption issue found by gfgtdf and makes the parameter work like the rest, though it should be noted that the caller doesn't do anything useful with it at the moment and needs to be fixed separately. (See also commit f16dec91b93f08844d999c9056d165951c980148.) --- src/gui/dialogs/editor/editor_edit_side.cpp | 2 +- src/gui/dialogs/editor/editor_edit_side.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/dialogs/editor/editor_edit_side.cpp b/src/gui/dialogs/editor/editor_edit_side.cpp index be6649da88f2..8daa7e5b8826 100644 --- a/src/gui/dialogs/editor/editor_edit_side.cpp +++ b/src/gui/dialogs/editor/editor_edit_side.cpp @@ -62,7 +62,7 @@ teditor_edit_side::teditor_edit_side(int side, bool& shroud, bool& share_maps, team::CONTROLLER& controller, - int controller_num, + int& controller_num, bool& no_leader, bool& hidden) : controller_(controller) diff --git a/src/gui/dialogs/editor/editor_edit_side.hpp b/src/gui/dialogs/editor/editor_edit_side.hpp index 33ed70e1752d..1e881f269fd4 100644 --- a/src/gui/dialogs/editor/editor_edit_side.hpp +++ b/src/gui/dialogs/editor/editor_edit_side.hpp @@ -39,7 +39,7 @@ class teditor_edit_side : public tdialog bool& shroud, bool& share_maps, team::CONTROLLER& controller, - int controller_num, + int& controller_num, bool& no_leader, bool& hidden);