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) 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 recent; 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& 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")