Merge lp:~widelands-dev/widelands/bug-1508117 into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 7564
Proposed branch: lp:~widelands-dev/widelands/bug-1508117
Merge into: lp:widelands
Diff against target: 30 lines (+10/-1)
2 files modified
src/editor/ui_menus/editor_main_menu_load_or_save_map.cc (+5/-1)
src/ui_fsmenu/mapselect.cc (+5/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1508117
Reviewer Review Type Date Requested Status
TiborB Approve
Review via email: mp+275079@code.launchpad.net

Description of the change

Fixed a crash in load/save map dialogs.

To post a comment you must log in.
Revision history for this message
TiborB (tiborb95) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/editor/ui_menus/editor_main_menu_load_or_save_map.cc'
2--- src/editor/ui_menus/editor_main_menu_load_or_save_map.cc 2015-10-17 19:57:42 +0000
3+++ src/editor/ui_menus/editor_main_menu_load_or_save_map.cc 2015-10-20 17:43:39 +0000
4@@ -211,5 +211,9 @@
5 }
6
7 table_.fill(maps_data_, display_type);
8- ok_.set_enabled(false);
9+ if (table_.size() > 0) {
10+ table_.select(0);
11+ } else {
12+ ok_.set_enabled(false);
13+ }
14 }
15
16=== modified file 'src/ui_fsmenu/mapselect.cc'
17--- src/ui_fsmenu/mapselect.cc 2015-10-17 19:57:42 +0000
18+++ src/ui_fsmenu/mapselect.cc 2015-10-20 17:43:39 +0000
19@@ -376,6 +376,11 @@
20 }
21 }
22 table_.fill(maps_data_, display_type);
23+ if (table_.size() > 0) {
24+ table_.select(0);
25+ } else {
26+ ok_.set_enabled(false);
27+ }
28 }
29
30 /*

Subscribers

People subscribed via source and target branches

to status/vote changes: