[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-memleak-net-ui into lp:widelands

2019-02-11 Thread noreply 
The proposal to merge lp:~widelands-dev/widelands/bug-memleak-net-ui into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-memleak-net-ui/+merge/362945
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-memleak-net-ui into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-memleak-net-ui into lp:widelands

2019-02-11 Thread GunChleoc 
Memory leak and fix confirmed. Code LGTM :)

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-memleak-net-ui/+merge/362945
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-memleak-net-ui into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-memleak-net-ui into lp:widelands

2019-02-10 Thread bunnybot 
Continuous integration builds have changed state:

Travis build 4452. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/491252462.
Appveyor build 4240. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_memleak_net_ui-4240.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-memleak-net-ui/+merge/362945
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-memleak-net-ui into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-memleak-net-ui into lp:widelands

2019-02-10 Thread Notabilis 
Notabilis has proposed merging lp:~widelands-dev/widelands/bug-memleak-net-ui 
into lp:widelands.

Commit message:
Fixing memory leak in network UI.


Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-memleak-net-ui/+merge/362945

The leak is reported to me after joining and starting a (localhost) LAN game.
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/bug-memleak-net-ui into lp:widelands.
=== modified file 'src/network/gameclient.cc'
--- src/network/gameclient.cc	2018-12-13 07:24:01 +
+++ src/network/gameclient.cc	2019-02-10 13:34:15 +
@@ -173,8 +173,8 @@
 	game.set_write_syncstream(g_options.pull_section("global").get_bool("write_syncstreams", true));
 
 	try {
-		UI::ProgressWindow* loader_ui = new UI::ProgressWindow();
-		d->modal = loader_ui;
+		std::unique_ptr loader_ui(new UI::ProgressWindow());
+		d->modal = loader_ui.get();
 		std::vector tipstext;
 		tipstext.push_back("general_game");
 		tipstext.push_back("multiplayer");
@@ -182,7 +182,7 @@
 			tipstext.push_back(get_players_tribe());
 		} catch (NoTribe) {
 		}
-		GameTips tips(*loader_ui, tipstext);
+		GameTips tips(*loader_ui.get(), tipstext);
 
 		loader_ui->step(_("Preparing game"));
 
@@ -199,9 +199,9 @@
 		game.set_ibase(igb);
 		igb->set_chat_provider(*this);
 		if (!d->settings.savegame) {  //  new map
-			game.init_newgame(loader_ui, d->settings);
+			game.init_newgame(loader_ui.get(), d->settings);
 		} else {  // savegame
-			game.init_savegame(loader_ui, d->settings);
+			game.init_savegame(loader_ui.get(), d->settings);
 		}
 		d->time.reset(game.get_gametime());
 		d->lasttimestamp = game.get_gametime();
@@ -209,7 +209,7 @@
 
 		d->modal = igb;
 		game.run(
-		   loader_ui,
+		   loader_ui.get(),
 		   d->settings.savegame ?
 		  Widelands::Game::Loaded :
 		  d->settings.scenario ? Widelands::Game::NewMPScenario : Widelands::Game::NewNonScenario,

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp