# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1669925084 18000
# Node ID 16fb0e3e6aabd1390a3cd4b86ca9ac1f97266821
# Parent  cd47350ec1af05cb7198a6bc0a00e5eddf208f28# Parent  132547cc1ab25d3b0aeb3f22597ad86907f46b9e
maint: Merge stable to default.

diff -r cd47350ec1af -r 16fb0e3e6aab libgui/src/resource-manager.cc
--- a/libgui/src/resource-manager.cc	Thu Dec 01 12:51:20 2022 -0500
+++ b/libgui/src/resource-manager.cc	Thu Dec 01 15:04:44 2022 -0500
@@ -231,11 +231,37 @@
 
   gui_settings * resource_manager::get_settings (void) const
   {
+    if (! m_settings)
+      {
+        QString msg (QT_TR_NOOP ("Octave has lost its settings.\n"
+                                 "This should not happen.\n\n"
+                                 "Please report this bug.\n\n"
+                                 "Octave GUI must be closed now."));
+
+        QMessageBox::critical (nullptr,
+                               QString (QT_TR_NOOP ("Octave Critical Error")),
+                               msg);
+        exit (1);
+      }
+
     return m_settings;
   }
 
   gui_settings * resource_manager::get_default_settings (void) const
   {
+    if (m_settings)
+      {
+        QString msg (QT_TR_NOOP ("Octave has lost its default settings.\n"
+                                 "This should not happen.\n"
+                                 "Please report this bug.\n\n"
+                                 "Octave GUI must be closed now."));
+
+        QMessageBox::critical (nullptr,
+                               QString (QT_TR_NOOP ("Octave Critical Error")),
+                               msg);
+        exit (1);
+      }
+
     return m_default_settings;
   }