From 1807f19b51f9f550fb2cb2635e5d396f5ee14120 Mon Sep 17 00:00:00 2001 From: HJfod <60038575+HJfod@users.noreply.github.com> Date: Wed, 30 Nov 2022 17:46:00 +0200 Subject: [PATCH] fix build - no warning on m_icon = icon in Notification - fix mac InternalLoader.cpp using Loader::get()->getLogs instead of log::Logs::list() --- loader/src/platform/mac/InternalLoader.cpp | 2 +- loader/src/ui/nodes/Notification.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/src/platform/mac/InternalLoader.cpp b/loader/src/platform/mac/InternalLoader.cpp index 3b6cddc0..6e0c042e 100644 --- a/loader/src/platform/mac/InternalLoader.cpp +++ b/loader/src/platform/mac/InternalLoader.cpp @@ -19,7 +19,7 @@ void InternalLoader::platformMessageBox(char const* title, std::string const& in void InternalLoader::openPlatformConsole() { m_platformConsoleOpen = true; - for (auto const& log : Loader::get()->getLogs()) { + for (auto const& log : log::Logs::list()) { std::cout << log->toString(true) << "\n"; } } diff --git a/loader/src/ui/nodes/Notification.cpp b/loader/src/ui/nodes/Notification.cpp index d1d44ba5..92f6ffeb 100644 --- a/loader/src/ui/nodes/Notification.cpp +++ b/loader/src/ui/nodes/Notification.cpp @@ -23,7 +23,7 @@ bool Notification::init(std::string const& text, CCSprite* icon, float time) { m_label->setScale(.6f); m_bg->addChild(m_label); - if (m_icon = icon) { + if ((m_icon = icon)) { m_bg->addChild(icon); }