Skip to content

Commit 9edabb9

Browse files
shugaaBjoern
authored andcommitted
Fixed initialization order in a couple of places.
1 parent bc81498 commit 9edabb9

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/dlg_ui_ex.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,16 @@ bool dlg_ui::wgtmap_evt_endselect_ex(const florb::wgt_map::event_endselect *e)
150150

151151
void dlg_ui::create_ex(void)
152152
{
153+
// Init dialog window handles
154+
m_dlg_search = NULL;
155+
m_dlg_garminul = NULL;
156+
m_dlg_garmindl = NULL;
157+
m_dlg_settings = NULL;
158+
m_dlg_editselection = NULL;
159+
m_dlg_txtdisp = NULL;
160+
m_dlg_bulkdl = NULL;
161+
m_dlg_eleprofile = NULL;
162+
153163
// Set the window icon
154164
florb::utils::set_window_icon(m_window);
155165

@@ -218,7 +228,7 @@ void dlg_ui::update_choice_map_ex(void)
218228
m_choice_overlay->add((*it).as<florb::cfg_tileserver>().name().c_str());
219229
}
220230

221-
// If there are any connfigured tileservers at all...
231+
// If there are any configured tileservers at all...
222232
if (section.size() > 0)
223233
{
224234
// Invalid index, reset to default (first item)

src/wgt_map.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99
florb::wgt_map::wgt_map(int x, int y, int w, int h, const char *label) :
1010
Fl_Widget(x, y, w, h, label),
1111
m_basemap(NULL),
12+
m_overlay(NULL),
13+
m_scale(NULL),
1214
m_tracklayer(NULL),
15+
m_markerlayer(NULL),
1316
m_gpsdlayer(NULL),
17+
m_areaselectlayer(NULL),
1418
m_mousepos(0, 0),
1519
m_viewport(w, h),
1620
m_viewport_off(0, 0),

0 commit comments

Comments
 (0)