Skip to content

Commit

Permalink
Merge pull request #476 from jongough/updates
Browse files Browse the repository at this point in the history
Update version number and remove code provoking Asert
  • Loading branch information
jongough authored Aug 1, 2021
2 parents 23fc558 + 9542018 commit 272ee42
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ set(PACKAGE "ocpn_draw")
set(VERSION_MAJOR "1")
set(VERSION_MINOR "8")
set(VERSION_PATCH "7")
set(VERSION_TWEAK "0")
set(VERSION_DATE "25/07/2021") # DD/MM/YYYY format
set(VERSION_TWEAK "1")
set(VERSION_DATE "31/07/2021") # DD/MM/YYYY format
set(OCPN_MIN_VERSION "ov50")
set(OCPN_API_VERSION_MAJOR "1")
set(OCPN_API_VERSION_MINOR "16")
Expand Down
2 changes: 0 additions & 2 deletions src/PathAndPointManagerDialogImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,6 @@ PathAndPointManagerDialogImpl::PathAndPointManagerDialogImpl(wxWindow* parent)
m_listCtrlLayers->InsertColumn( colLAYNAME, _("Layer Name"), wxLIST_FORMAT_LEFT, wxLIST_AUTOSIZE );
m_listCtrlLayers->InsertColumn( colLAYITEMS, _("No. of items"), wxLIST_FORMAT_LEFT, wxLIST_AUTOSIZE );

// This line is non-sense, provokes wxAssert. Parameter to "ChangeSelection" should be a page number.
//int l_lastpage = m_notebookPathAndPointManager->ChangeSelection(m_panelPath->GetId());
m_panelPath->SetFocus();

if(g_iDefaultPathAnPointManagerDialogPostionX == -1 || g_iDefaultPathAnPointManagerDialogPostionY == -1) Center();
Expand Down

0 comments on commit 272ee42

Please sign in to comment.