Skip to content

Commit 75be7de

Browse files
committed
fix the null ptr warning
1 parent 694abe0 commit 75be7de

1 file changed

Lines changed: 4 additions & 12 deletions

File tree

plotpy/widgets/colormap_manager.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ def __init__(
7777
validator = QG.QRegExpValidator(regex)
7878
self._colormap_name_edit = QW.QLineEdit(self)
7979
self._colormap_name_edit.setValidator(validator)
80-
# self._colormap_name_edit.setMaximumWidth(maxw=200)
8180
self._colormap_name_edit.setPlaceholderText("Enter a new custom colomap filame")
8281
self._colormap_name_edit.setText(active_colormap)
8382
self._colormap_name_edit.setToolTip(
@@ -227,12 +226,11 @@ def __init__(
227226
self.cmap_manager = ColorMapManager(self, active_colormap)
228227
self.btn_close = QW.QPushButton(_("Close"))
229228
self._layout.addWidget(self.cmap_manager)
230-
# bottom_layout = QW.QHBoxLayout()
231229
self._layout.addWidget(self.btn_close, alignment=QC.Qt.AlignmentFlag.AlignRight)
232230
self.setLayout(self._layout)
233-
self.btn_close.clicked.connect(self.close)
231+
self.btn_close.clicked.connect(self.check_save_before_close)
234232

235-
def check_save_before_close(self) -> bool:
233+
def check_save_before_close(self):
236234
"""Adds logic on top of the normal QDialog.close method to handle colormap save."""
237235
if not self.cmap_manager.current_changes_saved:
238236
save = self.cmap_manager.show_validation_modal(
@@ -246,14 +244,8 @@ def check_save_before_close(self) -> bool:
246244
if save:
247245
self.cmap_manager.saveColormap()
248246

249-
return self.cmap_manager.current_changes_saved
250-
251-
def closeEvent(self, event: QC.QEvent): # noqa: N802
252-
if self.check_save_before_close():
253-
# self.close()
254-
event.accept()
255-
else:
256-
event.ignore()
247+
if self.cmap_manager.current_changes_saved:
248+
self.close()
257249

258250
def show(self) -> None:
259251
return super().show()

0 commit comments

Comments
 (0)