Merge branch 'main' into v2.17.x

[dcpomatic.git] / src / tools / dcpomatic.cc

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 1a2f4100b424d037d3e56e8a35b5cc922d07ca71..0244229655ffa0020c63e872e3106938884ee5c3 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -465,6 +465,7 @@ public:
        {
                auto film = make_shared<Film>(file);
                auto const notes = film->read_metadata ();
+               film->read_ui_state();
 
                if (film->state_version() == 4) {
                        error_dialog (
@@ -1374,7 +1375,7 @@ private:
                add_item (edit, _("Select all\tShift-Ctrl-A"), ID_edit_select_all, NEEDS_FILM);
 
 #ifdef __WXOSX__
-               add_item (_file_menu, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS);
+               add_item(_file_menu, _("&Preferences...\tCtrl-,"), wxID_PREFERENCES, ALWAYS);
 #else
                edit->AppendSeparator ();
                /* [Shortcut] Ctrl+P:Open preferences window */
@@ -1504,6 +1505,12 @@ private:
                _history_items = history.size ();
 
                dcpomatic_log->set_types (Config::instance()->log_types());
+
+#ifdef DCPOMATIC_GROK
+               if (what == Config::GROK) {
+                       setup_grok_library_path();
+               }
+#endif
        }
 
        void update_checker_state_changed ()
@@ -1756,6 +1763,7 @@ private:
 
 #ifdef DCPOMATIC_GROK
                        grk_plugin::setMessengerLogger(new grk_plugin::GrokLogger("[GROK] "));
+                       setup_grok_library_path();
 #endif
                }
                catch (exception& e)