Merge pull request #9122 from liamwhite/burnt-chicken

nvdrv: fix container destruction order

src/core/hle/service/nvdrv/nvdrv.cpp

@@ -53,7 +53,7 @@ void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger
 }
 
 Module::Module(Core::System& system)
-    : service_context{system, "nvdrv"}, events_interface{*this}, container{system.Host1x()} {
+    : container{system.Host1x()}, service_context{system, "nvdrv"}, events_interface{*this} {
     builders["/dev/nvhost-as-gpu"] = [this, &system](DeviceFD fd) {
         std::shared_ptr<Devices::nvdevice> device =
             std::make_shared<Devices::nvhost_as_gpu>(system, *this, container);

src/core/hle/service/nvdrv/nvdrv.h

@@ -97,6 +97,9 @@ private:
     friend class EventInterface;
     friend class Service::NVFlinger::NVFlinger;
 
+    /// Manages syncpoints on the host
+    NvCore::Container container;
+
     /// Id to use for the next open file descriptor.
     DeviceFD next_fd = 1;
 
@@ -108,9 +111,6 @@ private:
 
     EventInterface events_interface;
 
-    /// Manages syncpoints on the host
-    NvCore::Container container;
-
     std::unordered_map<std::string, std::function<FilesContainerType::iterator(DeviceFD)>> builders;
 };