# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1590234831 14400
# Node ID ec764709312e883ba4f82576534565b519116e2f
# Parent  c6d10df71863201a344994117c17a7d893c7622f# Parent  60f3b8702ab7892daa7e6e5755e270b87aface66
maint: Merge stable to default.

diff -r c6d10df71863 -r ec764709312e libgui/graphics/ObjectProxy.cc
--- a/libgui/graphics/ObjectProxy.cc	Fri May 22 22:23:38 2020 -0400
+++ b/libgui/graphics/ObjectProxy.cc	Sat May 23 07:53:51 2020 -0400
@@ -100,7 +100,15 @@
   void
   ObjectProxy::finalize (void)
   {
-    emit sendFinalize ();
+    if (! m_object)
+      return;
+
+    Qt::ConnectionType t = Qt::BlockingQueuedConnection;
+
+    if (QThread::currentThread () == QCoreApplication::instance ()->thread ())
+      t = Qt::DirectConnection;
+
+    QMetaObject::invokeMethod (m_object, "slotFinalize", t);
   }
 
   void
diff -r c6d10df71863 -r ec764709312e libgui/src/main-window.cc
--- a/libgui/src/main-window.cc	Fri May 22 22:23:38 2020 -0400
+++ b/libgui/src/main-window.cc	Sat May 23 07:53:51 2020 -0400
@@ -1792,7 +1792,7 @@
         m_open_action->setShortcut (no_key);
         m_new_script_action->setShortcut (no_key);
         m_new_function_action->setShortcut (no_key);
-        m_new_function_action->setShortcut (no_key);
+        m_new_figure_action->setShortcut (no_key);
         m_load_workspace_action->setShortcut (no_key);
         m_save_workspace_action->setShortcut (no_key);
         m_preferences_action->setShortcut (no_key);
@@ -2758,7 +2758,7 @@
     scmgr.set_shortcut (m_open_action, sc_main_file_open_file);
     scmgr.set_shortcut (m_new_script_action, sc_main_file_new_file);
     scmgr.set_shortcut (m_new_function_action, sc_main_file_new_function);
-    scmgr.set_shortcut (m_new_function_action, sc_main_file_new_figure);
+    scmgr.set_shortcut (m_new_figure_action, sc_main_file_new_figure);
     scmgr.set_shortcut (m_load_workspace_action, sc_main_file_load_workspace);
     scmgr.set_shortcut (m_save_workspace_action, sc_main_file_save_workspace);
     scmgr.set_shortcut (m_exit_action, sc_main_file_exit);