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

fix bug #14266 (revert all changes not working in the map editor)

Browse source
This commit is contained in:
Tomasz Śniatowski 2009-10-04 15:21:45 +01:00
parent bbc38b4799
commit 4a340bc302
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -12,6 +12,7 @@ Version 1.7.6+svn:
displaying descriptions
* Various code cleanups
* Fixed a lot of issues found by cppcheck.
* Fixed "Revert all changes" feature in the map editor (bug #14266)
Version 1.7.6:
* AI:

6
src/editor/editor_controller.cpp
View file

@ -670,12 +670,12 @@ bool editor_controller::check_switch_open_map(const std::string& fn)
void editor_controller::load_map(const std::string& filename, bool new_context)
{
if (check_switch_open_map(filename)) return;
if (new_context && check_switch_open_map(filename)) return;
LOG_ED << "Load map: " << filename << (new_context ? " (new)" : " (same)") << "\n";
try {
std::auto_ptr<map_context> mc(new map_context(game_config_, filename));
if (mc->get_filename() != filename) {
if (check_switch_open_map(mc->get_filename())) return;
if (new_context && check_switch_open_map(mc->get_filename())) return;
}
if (new_context) {
int new_id = add_map_context(mc.release());
@ -713,7 +713,7 @@ void editor_controller::load_map(const std::string& filename, bool new_context)
void editor_controller::revert_map()
{
if (!confirm_discard()) return;
const std::string& filename = get_map_context().get_filename();
std::string filename = get_map_context().get_filename();
if (filename.empty()) {
ERR_ED << "Empty filename in map revert\n";
return;