Skip to content

Commit

Permalink
Fixed bug #24644: Units moving after in game help exit (#1002)
Browse files Browse the repository at this point in the history
  • Loading branch information
qmo2015 authored and CelticMinstrel committed May 1, 2017
1 parent ba6bf07 commit c551cfd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions changelog
Expand Up @@ -54,6 +54,7 @@ Version 1.13.7+dev:
* Improved Addon Manager and MP Staging interfaces at low resolutions.
* Fixed bug that allows you to use the minimap to bypass view locking
* You can now change the theme (in preferences) while a game is in progress.
* Fixed units moving after in game help exit. (#24644)
* Fixed a bug that caused rapid announce messages to overlap eachother. (bug #21634)
* WML Engine:
* Add base_income key to [store_side]
Expand Down
3 changes: 3 additions & 0 deletions data/core/about.cfg
Expand Up @@ -1407,6 +1407,9 @@
[/entry]
[entry]
name = "Pubudu Gunawardena (ugudu)"
[/entry]
[entry]
name = "Qi Mo (qmo2015)"
[/entry]
[entry]
name = "Quetzalcoatl"
Expand Down
4 changes: 3 additions & 1 deletion src/mouse_events.cpp
Expand Up @@ -470,8 +470,10 @@ bool mouse_handler::right_click_show_menu(int x, int y, const bool /*browse*/)

void mouse_handler::select_or_action(bool browse)
{
if (!pc_.get_map_const().on_board(last_hex_))
if (!pc_.get_map_const().on_board(last_hex_)){
tooltips::click(drag_from_x_, drag_from_y_);
return;
}

// Load whiteboard partial moves
wb::future_map_if_active planned_unit_map;
Expand Down
2 changes: 0 additions & 2 deletions src/mouse_handler_base.cpp
Expand Up @@ -220,8 +220,6 @@ bool mouse_handler_base::right_click_show_menu(int /*x*/, int /*y*/, const bool

bool mouse_handler_base::left_click(int x, int y, const bool /*browse*/)
{
if(tooltips::click(x,y))
return true;

if(gui().view_locked()) {
return false;
Expand Down

0 comments on commit c551cfd

Please sign in to comment.