From d19a00d97de14bf0fa418aceac7b14102256bb4a Mon Sep 17 00:00:00 2001 From: offtkp Date: Fri, 20 Oct 2023 19:33:37 +0300 Subject: [PATCH] Friendship revoked with httpserver --- include/emulator.hpp | 1 - src/http_server.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/emulator.hpp b/include/emulator.hpp index 745ede6d..ec2c501e 100644 --- a/include/emulator.hpp +++ b/include/emulator.hpp @@ -60,7 +60,6 @@ class Emulator { #ifdef PANDA3DS_ENABLE_HTTP_SERVER HttpServer httpServer; - friend struct HttpServer; #endif #ifdef PANDA3DS_ENABLE_DISCORD_RPC diff --git a/src/http_server.cpp b/src/http_server.cpp index f595a25c..41c7ae82 100644 --- a/src/http_server.cpp +++ b/src/http_server.cpp @@ -228,7 +228,7 @@ void HttpServer::startHttpServer() { } std::string HttpServer::status() { - HIDService& hid = emulator->kernel.getServiceManager().getHID(); + HIDService& hid = emulator->getServiceManager().getHID(); std::stringstream stringStream; stringStream << "Panda3DS\n"; @@ -271,7 +271,7 @@ void HttpServer::processActions() { return; } - HIDService& hid = emulator->kernel.getServiceManager().getHID(); + HIDService& hid = emulator->getServiceManager().getHID(); while (!actionQueue.empty()) { std::unique_ptr action = std::move(actionQueue.front());