[Scummvm-git-logs] scummvm master -> cb83247d614c124c1711a8452a19259c53644b67

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
cb83247d61 BAGEL: remove useless nullptr check causing false positive of null derenference in Coverity (Fix CID 1545892 and 1545905


Commit: cb83247d614c124c1711a8452a19259c53644b67
    https://github.com/scummvm/scummvm/commit/cb83247d614c124c1711a8452a19259c53644b67
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-20T08:55:17+01:00

Commit Message:
BAGEL: remove useless nullptr check causing false positive of null derenference in Coverity (Fix CID 1545892 and 1545905)

Changed paths:
    engines/bagel/dialogs/restore_dialog.cpp
    engines/bagel/dialogs/save_dialog.cpp


diff --git a/engines/bagel/dialogs/restore_dialog.cpp b/engines/bagel/dialogs/restore_dialog.cpp
index dfc0a114c64..fc6b601a3c3 100644
--- a/engines/bagel/dialogs/restore_dialog.cpp
+++ b/engines/bagel/dialogs/restore_dialog.cpp
@@ -199,7 +199,7 @@ ErrorCode CBagRestoreDialog::attach() {
 		_pText->setWeight(TEXT_BOLD);
 
 		// Set initial selected item
-		if (_pListBox != nullptr && _nSelectedItem != -1) {
+		if (_nSelectedItem != -1) {
 			_pText->setText(_pListBox->getText(_nSelectedItem));
 		} else {
 			_pText->setText("");
diff --git a/engines/bagel/dialogs/save_dialog.cpp b/engines/bagel/dialogs/save_dialog.cpp
index 3f7cc13c285..a8af3400760 100644
--- a/engines/bagel/dialogs/save_dialog.cpp
+++ b/engines/bagel/dialogs/save_dialog.cpp
@@ -201,13 +201,10 @@ ErrorCode CBagSaveDialog::attach() {
 			_pEditText->setFocus();
 		}
 
-		if (_pListBox != nullptr) {
-			_pListBox->setSelectedItem(_nSelectedItem, false);
-
-			if (_nSelectedItem >= 9) {
+		_pListBox->setSelectedItem(_nSelectedItem, false);
 
-				_pListBox->scrollTo(_nSelectedItem - 8);
-			}
+		if (_nSelectedItem >= 9) {
+			_pListBox->scrollTo(_nSelectedItem - 8);
 		}
 	} else if (_pButtons[0] != nullptr) {
 		_pButtons[0]->setState(BUTTON_DISABLED);