From 67b2a3abbeb90d5279728716baa673e3b31274af Mon Sep 17 00:00:00 2001
From: Darby Johnston <darbyjohnston@yahoo.com>
Date: Wed, 13 Sep 2023 12:11:09 -0700
Subject: [PATCH 1/3] Build fix

---
 examples/usdrecord-gl/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/usdrecord-gl/CMakeLists.txt b/examples/usdrecord-gl/CMakeLists.txt
index 40433a2fd..ffc7c4b2e 100644
--- a/examples/usdrecord-gl/CMakeLists.txt
+++ b/examples/usdrecord-gl/CMakeLists.txt
@@ -4,6 +4,6 @@ set(SOURCE
     main.cpp)
 
 add_executable(usdrecord-gl ${SOURCE} ${HEADERS})
-target_link_libraries(usdrecord-gl GLFW tf usd usdGeom usdImagingGL usdAppUtils hd)
+target_link_libraries(usdrecord-gl glfw tf usd usdGeom usdImagingGL usdAppUtils hd)
 set_target_properties(usdrecord-gl PROPERTIES FOLDER examples)
 

From b61268cc8c68dff66bcb94b55ac0fe2ad936eec6 Mon Sep 17 00:00:00 2001
From: Darby Johnston <darbyjohnston@yahoo.com>
Date: Wed, 13 Sep 2023 16:36:54 -0700
Subject: [PATCH 2/3] Settings fixes

---
 lib/tlPlayQtApp/SettingsObject.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/tlPlayQtApp/SettingsObject.cpp b/lib/tlPlayQtApp/SettingsObject.cpp
index 87677e867..dc9a1d780 100644
--- a/lib/tlPlayQtApp/SettingsObject.cpp
+++ b/lib/tlPlayQtApp/SettingsObject.cpp
@@ -96,11 +96,11 @@ namespace tl
         void SettingsObject::setDefaultValue(const QString& name, const QVariant& value)
         {
             TLRENDER_P();
-            if (!p.settings.contains(name))
+            if (!p.settings.contains(version(name)))
             {
-                p.settings.setValue(name, value);
+                p.settings.setValue(version(name), value);
             }
-            p.defaultValues[name] = value;
+            p.defaultValues[version(name)] = value;
         }
 
         const QList<QString>& SettingsObject::recentFiles() const
@@ -111,9 +111,9 @@ namespace tl
         void SettingsObject::setValue(const QString& name, const QVariant& value)
         {
             TLRENDER_P();
-            if (!p.settings.contains(name))
+            if (!p.settings.contains(version(name)))
             {
-                p.defaultValues[name] = value;
+                p.defaultValues[version(name)] = value;
             }
             p.settings.setValue(version(name), value);
             if (name == "Misc/ToolTipsEnabled")

From 2a292f87e23a34919ee63f957ba33369bd0d76d9 Mon Sep 17 00:00:00 2001
From: Darby Johnston <darbyjohnston@yahoo.com>
Date: Wed, 13 Sep 2023 17:27:33 -0700
Subject: [PATCH 3/3] Manually delete the main window

---
 lib/tlPlayQtApp/App.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/tlPlayQtApp/App.cpp b/lib/tlPlayQtApp/App.cpp
index 5da7c5a97..235575b24 100644
--- a/lib/tlPlayQtApp/App.cpp
+++ b/lib/tlPlayQtApp/App.cpp
@@ -548,6 +548,7 @@ namespace tl
         App::~App()
         {
             TLRENDER_P();
+            p.mainWindow.reset();
             if (p.settingsObject)
             {
                 QList<QString> recent;