anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-20 15:01:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Guard against possible referencing null.

Browse Source 
Those checks might not be needed, but it's not self obvious from
the surrounding code. Because we already experienced crash from
similar change (cf 1c1c83eced), let's be prudent here.

If you know that these pointers can't be null from broader context
feel free to remove the guards.

Introduced by 24926b2e23, fix 104fdcc9be not backported
but now fixed by 1c1c83eced in 2.3.

https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg216414.html
This commit is contained in:
Pavel Sanda 2021-10-14 22:23:14 +02:00
parent 06acb7f806
commit f7de009b17
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontends/qt/BulletsModule.cpp
View File

@ -288,7 +288,8 @@ void BulletsModule::selectItem(int font, int character, bool select)
return; return;
QListWidget * lw = static_cast<QListWidget *>(bulletpaneSW->widget(font)); QListWidget * lw = static_cast<QListWidget *>(bulletpaneSW->widget(font));
lw->item(character)->setSelected(select); if (lw->item(character))
lw->item(character)->setSelected(select);
} }

3
src/frontends/qt/GuiPrefs.cpp
View File

@ -3443,7 +3443,8 @@ void PrefShortcuts::shortcutOkPressed()
if (item) { if (item) {
user_bind_.bind(&k, func); user_bind_.bind(&k, func);
shortcutsTW->sortItems(0, Qt::AscendingOrder); shortcutsTW->sortItems(0, Qt::AscendingOrder);
item->parent()->setExpanded(true); if (item->parent())
item->parent()->setExpanded(true);
shortcutsTW->setCurrentItem(item); shortcutsTW->setCurrentItem(item);
shortcutsTW->scrollToItem(item); shortcutsTW->scrollToItem(item);
} else { } else {