Просмотр исходного кода

Merge pull request #9148 from liamwhite/crab-language-at-home

k_server_session: fix crashes
bunnei 3 лет назад
Родитель
Сommit
316a2c1715
2 измененных файлов с 1 добавлено и 2 удалено
  1. 1 1
      src/core/hle/kernel/k_server_session.h
  2. 0 1
      src/core/hle/service/sm/sm.cpp

+ 1 - 1
src/core/hle/kernel/k_server_session.h

@@ -91,7 +91,7 @@ private:
 
     /// List of threads which are pending a reply.
     boost::intrusive::list<KSessionRequest> m_request_list;
-    KSessionRequest* m_current_request;
+    KSessionRequest* m_current_request{};
 
     KLightLock m_lock;
 };

+ 0 - 1
src/core/hle/service/sm/sm.cpp

@@ -80,7 +80,6 @@ ResultVal<Kernel::KPort*> ServiceManager::GetServicePort(const std::string& name
     }
 
     auto* port = Kernel::KPort::Create(kernel);
-    SCOPE_EXIT({ port->Close(); });
 
     port->Initialize(ServerSessionCountMax, false, name);
     auto handler = it->second;