|
Line
Link Here
|
| 0 |
-- a/src/plugins/contrib/BrowseTracker/BrowseTracker.cpp |
0 |
++ b/src/plugins/contrib/BrowseTracker/BrowseTracker.cpp |
|
Lines 1639-1646
Link Here
|
| 1639 |
// Note: when eb does not exist in the hash in which case |
1639 |
// Note: when eb does not exist in the hash in which case |
| 1640 |
// wxWidgets will automatically enter it along with a default (0) BrowseMarks ptr. |
1640 |
// wxWidgets will automatically enter it along with a default (0) BrowseMarks ptr. |
| 1641 |
// HashAddBrowse_Marks() should have added it above and also allocated a BrowseMarks* map; |
1641 |
// HashAddBrowse_Marks() should have added it above and also allocated a BrowseMarks* map; |
|
|
1642 |
#ifdef cbDEBUG |
| 1642 |
cbAssertNonFatal(m_EbBrowse_MarksHash.find(eb) != m_EbBrowse_MarksHash.end()); |
1643 |
cbAssertNonFatal(m_EbBrowse_MarksHash.find(eb) != m_EbBrowse_MarksHash.end()); |
| 1643 |
cbAssertNonFatal(m_EbBrowse_MarksHash[eb] != nullptr); |
1644 |
cbAssertNonFatal(m_EbBrowse_MarksHash[eb] != nullptr); |
|
|
1645 |
#endif |
| 1644 |
if (m_EbBrowse_MarksHash.find(eb) == m_EbBrowse_MarksHash.end()) break; |
1646 |
if (m_EbBrowse_MarksHash.find(eb) == m_EbBrowse_MarksHash.end()) break; |
| 1645 |
if (not m_EbBrowse_MarksHash[eb]) break; //avoid a possible crash here |
1647 |
if (not m_EbBrowse_MarksHash[eb]) break; //avoid a possible crash here |
| 1646 |
m_EbBrowse_MarksHash[eb]->RecordMarksFrom( *pBrowse_MarksArc); |
1648 |
m_EbBrowse_MarksHash[eb]->RecordMarksFrom( *pBrowse_MarksArc); |
| 1647 |
-- a/src/plugins/contrib/BrowseTracker/BrowseMarks.cpp |
1649 |
++ b/src/plugins/contrib/BrowseTracker/BrowseMarks.cpp |
|
Lines 268-281
Link Here
|
| 268 |
EditorBase* eb = m_pEdMgr->GetEditor(m_filePath); |
268 |
EditorBase* eb = m_pEdMgr->GetEditor(m_filePath); |
| 269 |
// Let's get paranoid here, since a crash was reported Nov. 2021 |
269 |
// Let's get paranoid here, since a crash was reported Nov. 2021 |
| 270 |
// https://forums.codeblocks.org/index.php?topic=24716.msg168611#msg168611 |
270 |
// https://forums.codeblocks.org/index.php?topic=24716.msg168611#msg168611 |
|
|
271 |
#ifdef cbDEBUG |
| 271 |
cbAssertNonFatal(eb != nullptr); |
272 |
cbAssertNonFatal(eb != nullptr); |
|
|
273 |
#endif |
| 272 |
#if defined(LOGGING) |
274 |
#if defined(LOGGING) |
| 273 |
if (not eb) asm("int3"); /*trap*/ |
275 |
if (not eb) asm("int3"); /*trap*/ |
| 274 |
#endif |
276 |
#endif |
| 275 |
if (not eb) return; |
277 |
if (not eb) return; |
| 276 |
|
278 |
|
| 277 |
cbEditor* cbed = Manager::Get()->GetEditorManager()->GetBuiltinEditor(eb); |
279 |
cbEditor* cbed = Manager::Get()->GetEditorManager()->GetBuiltinEditor(eb); |
|
|
280 |
#ifdef cbDEBUG |
| 278 |
cbAssertNonFatal(cbed != nullptr); |
281 |
cbAssertNonFatal(cbed != nullptr); |
|
|
282 |
#endif |
| 279 |
if (not cbed) return; |
283 |
if (not cbed) return; |
| 280 |
|
284 |
|
| 281 |
cbStyledTextCtrl* control = cbed->GetControl(); |
285 |
cbStyledTextCtrl* control = cbed->GetControl(); |
