0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid copying editor's map_contexts,

Browse source 
...fixing a memory leak during non-MDI load map with a non-empty undo
stack, as reported by Soliton
This commit is contained in:
Tomasz Śniatowski 2009-10-04 15:21:14 +01:00
parent ec428d4f24
commit bbc38b4799
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/editor/editor_controller.cpp
View file

@ -358,10 +358,11 @@ void editor_controller::switch_context(const int index)
current_context_index_ = index;
}
void editor_controller::replace_map_context(const map_context& new_mc)
void editor_controller::replace_map_context(map_context* new_mc)
{
map_context_refresher mcr(*this, new_mc);
get_map_context() = new_mc;
std::auto_ptr<map_context> del(map_contexts_[current_context_index_]);
map_context_refresher mcr(*this, *new_mc);
map_contexts_[current_context_index_] = new_mc;
}
void editor_controller::editor_settings_dialog()
@ -680,7 +681,7 @@ void editor_controller::load_map(const std::string& filename, bool new_context)
int new_id = add_map_context(mc.release());
switch_context(new_id);
} else {
replace_map_context(*mc);
replace_map_context(mc.release());
}
if (get_map_context().is_embedded()) {
const char* msg = _("Loaded embedded map data");
@ -727,7 +728,7 @@ void editor_controller::new_map(int width, int height, t_translation::t_terrain
int new_id = add_map_context(new map_context(m));
switch_context(new_id);
} else {
replace_map_context(map_context(m));
replace_map_context(new map_context(m));
}
}

2
src/editor/editor_controller.hpp
View file

@ -347,7 +347,7 @@ class editor_controller : public controller_base,
/**
* Replace the current map context and refresh accordingly
*/
void replace_map_context(const map_context& new_mc);
void replace_map_context(map_context* new_mc);
/**
* Callback function passed to display to be called on each redraw_everything run.

2
src/editor/map_context.hpp
View file

@ -31,7 +31,7 @@ namespace editor {
* as e.g. the undo stack is part of the map, not the editor as a whole. This might allow many
* maps to be open at the same time.
*/
class map_context
class map_context : private boost::noncopyable
{
public:
/**