# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1669993960 18000
# Node ID 3b7852a822e8d15a6edfaaac2a8bda43f0c266a9
# Parent  23664317f0d3cd4e7dc462d00e8e430e228f9add# Parent  c2a0e546aab1e882797cba5d994125c2eaf38c5e
maint: Merge stable to default.

diff -r 23664317f0d3 -r 3b7852a822e8 libgui/src/resource-manager.cc
--- a/libgui/src/resource-manager.cc	Thu Dec 01 20:05:44 2022 -0800
+++ b/libgui/src/resource-manager.cc	Fri Dec 02 10:12:40 2022 -0500
@@ -249,7 +249,7 @@
 
   gui_settings * resource_manager::get_default_settings (void) const
   {
-    if (m_settings)
+    if (! m_default_settings)
       {
         QString msg (QT_TR_NOOP ("Octave has lost its default settings.\n"
                                  "This should not happen.\n"