From 37a4b1257f6e8122765de26d2eae5cc9364e655c Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 27 Apr 2019 08:03:43 +0200 Subject: 20190427.1 global branch merge. Signed-off-by: Matteo Bernardini --- games/warmux/patches/return-null.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 games/warmux/patches/return-null.patch (limited to 'games/warmux/patches/return-null.patch') diff --git a/games/warmux/patches/return-null.patch b/games/warmux/patches/return-null.patch new file mode 100644 index 0000000000..851dfcbd16 --- /dev/null +++ b/games/warmux/patches/return-null.patch @@ -0,0 +1,11 @@ +--- src/interface/weapon_menu.cpp.orig 2016-05-09 15:22:36.895266463 +0200 ++++ src/interface/weapon_menu.cpp 2016-05-09 15:21:38.518476191 +0200 +@@ -391,7 +391,7 @@ + Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly) + { + if (!show) +- return false; ++ return NULL; + const std::vector& items = poly->GetItem(); + WeaponMenuItem * tmp; + Interface::GetInstance()->SetCurrentOverflyWeapon(NULL); -- cgit v1.2.3